Merge changes from topic "am-c7317350726e4f8792fc9044da867af2" into android12L-tests-dev am: 64eb5b2

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

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

Author: android-build-merge-worker-robot