Merge "[automerger skipped] Merge "DO NOT MERGE: Fixed PopupWindow tests to work with cutout" into oreo-mr1-cts-dev am: 0303c03da3  -s ours" into pie-cts-dev
am: adde1d4e01  -s ours

Change-Id: I7445ee1c812f8ac12d609c7bc8d33f44c74f4e99