Merge "DisplayCutout: Support more than one cutout" into pi-dev
am: 5d92e72482

Change-Id: Iadeec00a6863e307f061763d6ba7fdffb12d225d