Merge changes from topic "am-a051690f12c149d39c5885ea3c6d722d" into android12-tests-dev am: 5d47e7ac6c

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

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