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

Bug: 166295507
Merged-In: I940b5608806ee58ce31295b6e6da81200772dc46
Change-Id: I70c611122b5b5dd92fc7c17a0ef560dcb0efba70