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

Bug: 166295507
Merged-In: I4271b2006a41a392b6d3204555dbdd335b65b0e5
Change-Id: I3c77335b908d1ae9b675ef482589858ed27a9b97