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

Change-Id: I97042e60d0222efaeee65ac78f85d22e281ac87a