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

Bug: 166295507
Merged-In: I727f2d7476b85df3c133cfed15cc2d4d381b69ff
Change-Id: I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f