Merge changes from topic "am-87c857412e5c40acb794d94d47a8b05f" into android13-tests-dev am: 07667994be

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

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