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

Bug: 166295507
Merged-In: I3a1e355f510e6328d05e76ba2961562fe711da1b
Change-Id: I51411eabdf7f95382b4049a26f261b6d7af9aa86