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

Bug: 166295507
Merged-In: Ic74a2773a0813d4d85113ad91ecc5df7f9ce140b
Change-Id: I3d367a3babc9cb7ac6dbea396f70e10c5651d50b