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

Bug: 166295507
Merged-In: I34ccc9cc6314aeb5babb95302be1801fc9bacd99
Change-Id: Iaee18ba48fc5a8ec511074dd10d69c383e92583b