Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: I67f9a083e27a7f5134c810d95d19360e6e5a1b8f
Change-Id: I25f0ca04f2e967f35d377e923f73486b95dd47e3
tree: 58174fe71c6fae4fa9633784ddfa9bd7d252235e
  1. vrcore/
  2. xr/