Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f am: 9994462c am:...

Merge changes I5c7f1fc1,I6015581c into main am: 0b5a877f am: 9994462c am: 1dd1c771 am: b4d89edb am: e2926e7c

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



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