[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 5913678def -s ours am: 6442ef00dc -s ours

am skip reason: Change-Id I9d357223c08a3685a7ed793e9ddef11ac1530368 with SHA-1 8252d85f0f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/vndk/v30/+/12470260

Change-Id: I146713d24fff8c2e22dac4dfaa475e1ebc508078
tree: 50b6c0992f7bdc2356ac4701b4f1d0e1abc97555
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp