Merge "resolve merge conflicts of e32b3847 to...

Merge "resolve merge conflicts of e32b3847 to rvc-dev" into rvc-dev am: 7790f714

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

Change-Id: I0b4a0274e5a8a78d2d8c5ad5359534a25135e4bf