[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 64d43056 to rvc-dev am: 68805280 -s ours am: cbb9c3ce -s ours am: 4fb51f54 -s ours

am skip reason: Change-Id I67b229fbf52e913b0c4f5e7932021132ddc0598f with SHA-1 dbe59cdd is in history

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

Change-Id: Iade96b106a118aaf0bf3fa7cdec9dfaaf0f728f5