Merge changes from topic "am-fe5646e391f14a43a977056ad559439d" into...

Merge changes from topic "am-fe5646e391f14a43a977056ad559439d" into android15-tests-dev am: b2623a1a

Original change: https://android-review.googlesource.com/c/platform/build/+/3195473



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