Merge changes from topic "am-2a37c9ff7bed4801bfe9876744f6978d" into android12-tests-dev am: 4241b32

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

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

Author: android-build-merge-worker-robot