[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 87deed46 to rvc-dev am: 925c9f29 am: db8dd5e1 am: 5b976503 -s ours am: 383ded52 -s ours

am skip reason: Change-Id If801d23c431a71eddcf332c100b00eacd97ced5a with SHA-1 f6746c13 is in history

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

Change-Id: Ic9401a75c3ab1f0f0d0a5e8b43887fad627f1918