Merge changes from topic "am-4c9d9ee0068d46dc82ba85c3d320d1b9" into android13-tests-dev am: 8992655257

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

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