Merge changes from topic "am-c032716d499842109b0e8c370d05adbd" into android14-tests-dev am: 89aac5bfb9 -s ours

am skip reason: Merged-In I52a6ca4e30ce3d642e62a5b24c6cf1b26d9888eb with SHA-1 51d7b7310e is already in history

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

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