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

Bug: 166295507
Merged-In: Iff102d5d44046659da3ebe0b13b7f3390f056bcc
Change-Id: Id7ed53db36cdb9e96c352253ca5c05cc193bb90b