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

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

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

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

Change-Id: I77d8a45e45ff7ebc2295a71e4647a920ef1772a5