[conflict] Merge "Fix cutout related PopupWindowTest issues" into android12L-tests-dev am: 84f4e20ece

Original change: https://android-review.googlesource.com/c/platform/cts/+/2461933

Change-Id: I24df3d98f597f0bd97df8e82a5dd8d8260c2098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>