Merge "Fix broken test on devices with cutout" into rvc-dev am: 825e2de17c am: 81b8df467d am: 75f309ce0e am: 95f1c4d138 am: 3b7662c4fc

Change-Id: I1effbda87ec77dcbc9e380770a457f981967a275