Merge changes from topic "am-f6fc2fa385054d9d8eb1c5d923df8a3d" into android13-tests-dev am: 7b22182004 -s ours

am skip reason: Merged-In Id1e120ce270a8097182db87bc804ed79fe156603 with SHA-1 b2e4d3c38f is already in history

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

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