Merge changes from topic "am-6b985a78f67e4d82ae530a2f0aa4b413" into android13-tests-dev am: df6edf4 -s ours

am skip reason: Merged-In I56ef8d1cc5480814b5514d961d1a86f8d452276f with SHA-1 85c0f5b is already in history

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

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

Author: android-build-merge-worker-robot