Merge "Use on_vendor VNDK APEX for non-REL build" into rvc-d1-dev-plus-aosp am: 3b4517860e

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bramble/+/12383599

Change-Id: I5df5570d09ec9b4255ce3a0cfc08aaeba26861b8