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

Bug: 166295507
Merged-In: Id8e2e26bc585bbe4a78538e2014aebde3806da5d
Change-Id: If3301aad7610ef3d2472fcc677e9e89510fe652e