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 am: 7ee1a3ee
Change-Id: I719648be56446192ab38f70fe0bdd46cbc66d133