Merge changes from topic "am-e7d395d6fa3941648fa138d7beebf596" into android12-tests-dev am: a3030f85a7

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

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