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

Bug: 166295507
Merged-In: I716019210e2540744f308510fed6ad0483c14e62
Change-Id: Ie7cb70566695de61c3605b1b279dff6b65275601