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

Bug: 166295507
Merged-In: Ifb40c05ce8c1ace2166f1c84443c2dd763265993
Change-Id: I4fd03cb0e92605e8847af116a4d3f413bb2a8bcb