Merge "Merge "Fix broken test on devices with cutout" into rvc-dev am:...
Merge "Merge "Fix broken test on devices with cutout" into rvc-dev am: 825e2de1 am: 81b8df46" into rvc-d1-dev-plus-aosp am: f8c47373
Change-Id: I124c53e910eb0dd68218844c9cd591650453373a