Merge changes from topic "am-b61b6f11b8aa4ebd80ca64508f193cea" into android13-tests-dev am: 452a396

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

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

Author: android-build-merge-worker-robot