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

Bug: 166295507
Merged-In: I43f896443fd0b36d3538b242bdaa859181eb8eee
Change-Id: Ifb8126ec6c2ae6e79afc1a0cc620dc2f062df96d