Merge changes from topic "am-fa33a383ff0f4e08be1cb49d59f1732d" into android12-tests-dev am: e46a929b74

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

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