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

Bug: 166295507
Merged-In: I49618a21a384233768992ba2ae9eaea4507122b8
Change-Id: I54d04ed92be7cdaa42c5be776f666d772e1a5214