[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 233c1be0 to rvc-dev am: 3c125769 am: a907f283 am: 0c49dac5 -s ours am: bd726412 -s ours

am skip reason: Merged-In I416e8da75f84aa2b53995f525cf50501488dc972 with SHA-1 51c40913 is already in history

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

Change-Id: I5039cd6acefaee8fc0c220bf78249c85ed86a093