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

Bug: 166295507
Merged-In: If68d972395d8f428567eaff6249cca8ccc4c27c4
Change-Id: Ib40d6913020dc921be6880010459ddd8b6ee7556