[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 64d43056 to rvc-dev am: 68805280 am: 1fe94538 -s ours

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

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

Change-Id: I6935d7348bf0b66e5a61829ff18a1c947a6bfeb6