[automerger skipped] Merge changes I5a180544,Ifdf9bf97 into rvc-dev am:...

[automerger skipped] Merge changes I5a180544,Ifdf9bf97 into rvc-dev am: 0f4ab3cd am: 3141e62c -s ours am: 1163e546 -s ours

am skip reason: Change-Id I5a1805440452301a7e2c4ca91482b989638b54fb with SHA-1 5bc1744e is in history

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

Change-Id: Ib9fa7e18e3a2d99d15890c160001a15ff5641fb7