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

Bug: 166295507
Merged-In: Id80265833a6189f7145604c4deae78294f930512
Change-Id: I249e6ecc866b68d270cbe6066c8fcc4dfc2364a3