Merge changes from topic "am-5966aa68a3f24e6895b12468e8987746" into android13-tests-dev am: aa3c5289a0

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

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