Merge changes from topic "am-b61b6f11b8aa4ebd80ca64508f193cea" into android13-tests-dev am: 452a396 am: 4a6dd76 am: 9f56972 am: e432e0a am: 66ef3a8

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

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

Author: android-build-merge-worker-robot