[automerger skipped] Merge changes from topic "am-e519fa97a79e4646ae15a54b8cdeb978" into android13-tests-dev am: 6f5a7d3d48 -s ours am: 35897ca05c -s ours

am skip reason: Merged-In I52a6ca4e30ce3d642e62a5b24c6cf1b26d9888eb with SHA-1 51d7b7310e is already in history

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

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