Merge changes from topic "am-5f409098e12a46119f65d43857c216ce" into android13-tests-dev am: fe7946a am: 9cf00be

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

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

Author: android-build-merge-worker-robot