Merge changes from topic "am-258f4bedd45345c3b5a7f530457db827" into...

Merge changes from topic "am-258f4bedd45345c3b5a7f530457db827" into android15-tests-dev am: b2113b08

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



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