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

Bug: 166295507
Merged-In: I84ebef54432ccd94172f01d5c20984fec0e6a480
Change-Id: I76c7b62b7500c6af1fcfca614958c0993d921528