Merge changes from topic "am-214f22c5bbb34ff3a1080c37ce2b64f7" into android13-tests-dev am: 6543edf -s ours

am skip reason: Merged-In I0473c6f0220c44db22d2b243c3175b30f9febf01 with SHA-1 771b4b1 is already in history

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

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

Author: android-build-merge-worker-robot