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

Bug: 166295507
Merged-In: If70d13033a3abca3662fe226246144adf8a6e057
Change-Id: I42bbf5ec19c5adeef398fa265ff4db3e7304f066