[automerger skipped] Merge changes Ie769b9a9,Idb4e15b5 into rvc-dev am:...

[automerger skipped] Merge changes Ie769b9a9,Idb4e15b5 into rvc-dev am: 5ba6237c am: b3c817cb -s ours

am skip reason: Change-Id Ie769b9a99f080b75c1b82e458b5220261e9c1b47 with SHA-1 c60af159 is in history

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

Change-Id: I19cce99c1f1454c3b446cabe4ed62e7f7f0b16f1