Merge changes from topic "am-602c4b20b06a429197d25ebeedae1555" into android15-tests-dev am: 1ff5c4bfc8

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

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