[DO NOT MERGE] Stabilize WindowUntrustedTouchTest am: eadc7e55c4 am: d1fde0273a

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

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