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

Bug: 166295507
Merged-In: Iae4263276a05739c2e3a0e691f5d3a830a07d5cf
Change-Id: I05f0b0683b0759d0f9d014e9c8cbc16967c88a26