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

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

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