Merge changes from topic "am-712e909dd14d43f1a53bf4d74bef870a" into android12L-tests-dev am: 3457eaa6d1

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

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