Merge changes from topic "am-6ad61588f3234183bf92c50bc2e972bb" into android12-tests-dev am: c678cc5e3d

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

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