[automerger skipped] Merge changes from topic "am-fc961e172efa4e06ae420c11fa7dce78" into android12L-tests-dev am: 756e78ff28 -s ours am: 0f93b3013e -s ours

am skip reason: Merged-In If95a55a9e7e787a7a9a5e3058eed33667de44145 with SHA-1 9620f21cac is already in history

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

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