Merge "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"
am: e037e30539  -s ours

Change-Id: Id60b207c8278d4bbf4a49b341db4e970d42ce967