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

Bug: 166295507
Merged-In: I180ec2811830c58219308ec39a7426c2e4062324
Change-Id: Id5097fe04e360d4594818b5a7bf8067dcb641dcb