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

am skip reason: Change-Id Ifcce83e3d424a5eaaea38068a9cda79dc8c4b747 with SHA-1 3d32cdf3 is in history

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

Change-Id: Iad78059b94949031674b4771b161588d26fc8754