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

Bug: 166295507
Merged-In: Ibd6ee7bf201a920e72602010bef128083f235453
Change-Id: Id31817f370322187d410dbd76e3d19184f9cf28d