[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e695f3af21 -s ours am: f361cf86d6 -s ours

am skip reason: Change-Id Ic5671d970816c7410734e1f1ab8248e645d6ed44 with SHA-1 40a8f71f49 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/vndk/+/12470265

Change-Id: I99dd38371c58977377628e69c8167c8fa2118de0
tree: c64bbcfc6a1216e120bf8e65d46f783d22996aaa
  1. apex/
  2. Android.bp
  3. OWNERS