Merge changes from topic "am-37a6674c47d345d5b8c04c1839d9e0dc" into...

Merge changes from topic "am-37a6674c47d345d5b8c04c1839d9e0dc" into android15-tests-dev am: ffc71467 am: 98bcae86

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



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