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

Bug: 166295507
Merged-In: I9ee2bd1792ad9705c8cb201fdcb5ac4a220a5ea1
Change-Id: Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4