Merge changes from topic "am-dbb0a724ed984c459be13d99d31cd46f" into android12-tests-dev am: fd7cea5e34

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

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