Merge "Cutout: Add developer setting to mask the display cutout" into pi-dev am: c05c2d1e48
am: 6a403d8d5b

Change-Id: Ifc872c48e4670183f1f0fd3a4162d1eeb6c5c5e4