Merge changes from topic "am-e10973dc99fe42edb70aea8fe00dec21" into android13-tests-dev am: 0e3be53767 -s ours

am skip reason: Merged-In If95a55a9e7e787a7a9a5e3058eed33667de44145 with SHA-1 9620f21cac is already in history

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

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