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

Bug: 166295507
Merged-In: I37a77cdaf905fe0bf58ad8eebcdff36873aec71a
Change-Id: Idac9218a0e169df9d02d9d8d376a6816315a4b28