Merge changes from topic "am-661b18a457534eddbe5d5b41d1d9b7a1" into...

Merge changes from topic "am-661b18a457534eddbe5d5b41d1d9b7a1" into android15-tests-dev am: 7b2400a5 -s ours

am skip reason: Merged-In I01ea97bee5c9502eebda7e09eb617854e1aaf1a8 with SHA-1 ebe62658 is already in history

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



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