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

Bug: 166295507
Merged-In: If3a33e47082d9156a0d760849ceaae3a08be8a7d
Change-Id: Ieb1e215ffec643fcbb95c11873f0de07ebeb450b