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

am skip reason: Change-Id I5a1805440452301a7e2c4ca91482b989638b54fb with SHA-1 08dca38e is in history

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

Change-Id: I60077fbf8e0899d78eb45738459a26806c4fbd57