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

Bug: 166295507
Merged-In: If5e48560c5bfbbb1f1abb8f67843efda302a3b64
Change-Id: I08ba9038c15f54bf2313b1a741b49b239480c21a