Merge changes from topic "am-334602c90a0c431c829174ac24874bb4" into android12-tests-dev am: c4b49d83fc

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

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