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

Bug: 166295507
Merged-In: I0db3611581028c6e9c4b4586d5d496d2b7cff3c5
Change-Id: I46bb596b25597ccf5e0e9e1b6c88eb528342c34a