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

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

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



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