[automerger skipped] Merge changes I9f780b20,I53805737,I7373ba10,Ia5c5f65a...

[automerger skipped] Merge changes I9f780b20,I53805737,I7373ba10,Ia5c5f65a into sc-dev am: fa08e194 am: 5b930360 -s ours

am skip reason: Merged-In I9f780b20e18ce3a774e4aa04a276463070a64c34 with SHA-1 af99afa9 is already in history

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

Change-Id: Ibbfac6d39fad661dbc0d873501b3a34d6370ab91