Merge "Fix broken test on devices with cutout" into rvc-dev am: 825e2de17c am: 1ee2fad4b5 am: 03b2e6d9d4
Change-Id: I90a79783c641dcc3c544e457d6756914ffb8c0ee
This commit is contained in: