Merge "[automerger skipped] resolve merge conflicts of...

Merge "[automerger skipped] resolve merge conflicts of 64d43056 to rvc-dev am: 68805280 am: d6f7bf50 -s ours am: ead19e69 -s ours" into rvc-qpr-dev-plus-aosp am: c7568ce5 -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: I385e4053d9b6a0050db49afa9f118bfadca88cc0