[automerger skipped] Merge changes from topic "am-c50cb2a97c5642b58b0ebbe058560bdb" into android13-tests-dev am: 492faee944 am: 9edad7acc8 am: 8789c32ff2 am: 948b57897b -s ours

am skip reason: Merged-In I072eb0386a497bcd3beb276a9ef8519cc725d46f with SHA-1 7b0310c1f5 is already in history

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

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