[automerger skipped] Merge changes I5459c56d,I9b5c7c74 into sc-dev am:...

[automerger skipped] Merge changes I5459c56d,I9b5c7c74 into sc-dev am: 49eff1d1 -s ours am: a93d317b -s ours

am skip reason: Merged-In I5459c56de561c053ed671dc9d5cb3ee4820c0ee8 with SHA-1 6a58cc94 is already in history

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

Change-Id: I0ff091f6d36dcae7c9a13eff9b2e6f30733ea828