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

Bug: 166295507
Merged-In: I21aaf06e2e97afaae2492a54faf969c1d7d1d014
Change-Id: I624489eaaf6df7bce7c65b31ace07d90f99a0c89