Merge changes from topic "am-44319f0cd80f46d99e9c44eb0a650b87" into android13-tests-dev am: 627acbcc02 -s ours

am skip reason: Merged-In I32e6e7933b20b06fe23bc7400777646d4d071139 with SHA-1 75986f0636 is already in history

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

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