Merge "[conflict] Merge "Fix LoginActivityTest" into android11-tests-dev am: 5840ee0496" into android12-tests-dev am: 0ec38f2db6

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

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