Merge changes from topic "am-82030bb5d4cd493fa1dfc7e13242e81b" into android12L-tests-dev am: 582d7dc

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

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

Author: android-build-merge-worker-robot