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

Bug: 166295507
Merged-In: I8dd4b52e23221af07054fef572a60dd9d162340a
Change-Id: Ife6ea83de3e042af660a1d5517cec9f9e65e86ea