Merge changes from topic "am-b61b6f11b8aa4ebd80ca64508f193cea" into android13-tests-dev am: 452a396 am: 4a6dd76 am: 1e709cd am: 3bf69a1

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

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

Author: android-build-merge-worker-robot