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

Bug: 166295507
Merged-In: I4aa4df070a927b3f6cc2099ba6bbacc1fece664b
Change-Id: I1b25ac53a5929017ba076e1b79d202d73a319d28