Merge changes from topic "am-1e449a28a53e4abfb43063bba3fd36ce" into android15-tests-dev am: e15a359d52

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

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