Merge changes from topic "am-a88b61c7030544db8bb4a91e946fd0fa" into android12L-tests-dev am: da962ed -s ours

am skip reason: Merged-In I56ef8d1cc5480814b5514d961d1a86f8d452276f with SHA-1 85c0f5b is already in history

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

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

Author: android-build-merge-worker-robot