Merge changes from topic "am-e1d1821456f74bbd8728d9682e8d543b" into android13-tests-dev am: d4f6fb6 am: 8e94e74 am: 484ac73 am: 638918c

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

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

Author: android-build-merge-worker-robot