Merge changes from topic "am-bc31419430b84a9e963e825f6587ee85" into android12L-tests-dev am: 35ee03c2f3

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

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