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

Bug: 166295507
Merged-In: I155b87208e6fc16bced6f6f295b84f79c5287147
Change-Id: I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd