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

Bug: 166295507
Merged-In: Id4209f2f8680b0eb60e3aaa8eb26b6c18bf59125
Change-Id: I58746745416a0abfe332709351ed21a99f5abd3b