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

Bug: 166295507
Merged-In: I34ff976dc284be9a84ad6c15a87a04af6d274391
Change-Id: Icdac6de452cfb91db7fa31eb9f5633fd2372f22a