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

Bug: 166295507
Merged-In: I3ef9471c3daf6846f9e9ee56df2f57661d4ddb00
Change-Id: I1e02ed042efd096b4d664707cab17560adfa2de7