[conflict] Merge "Ensure launched window is focused and active in a11y cts" into android11-tests-dev am: c758a10d82

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

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