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

Bug: 166295507
Merged-In: Ie94127c1e981cb18671d5137ba0d39355d1353da
Change-Id: Ib22ad33bda8d561af537499b6d31ab6134eeae02