Merge changes from topic "am-f7c405afee5442ca962863efdc257175" into android12-tests-dev am: f87d3307c5

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

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