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

Bug: 166295507
Merged-In: I25a69ac99dc29101979d772e91feb440d1a16614
Change-Id: I1da6f480b01ed3afe1fa4fb5af78044945a51540