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

Bug: 166295507
Merged-In: Iea48870933d0b3c0c01f8f52b82edc69bb86ae4f
Change-Id: I093c4054709158e0ea0e8383ec49662bd6289e37