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

Bug: 166295507
Merged-In: I226d580f19930752070498158c3b61a3ddc9e52f
Change-Id: Ic326646a76a476ec42b720180da72da1057a9655