Merge changes from topic "am-b7907043ced44db9a6908095a7b4177d" into android13-tests-dev am: 42775cbd61

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

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