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

Bug: 166295507
Merged-In: I8695ee884ff9163eab82670e0dd3c711fa37258a
Change-Id: I9442538fdd0e5c1b7ad7b31dae5d175e292818ea