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

Bug: 166295507
Merged-In: Ia14f19fe48e2dcdd68ea530eba0aa85e6c2162ff
Change-Id: Iab7fdea5e3abd2047d55e1a2c57ea700551ee03c