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

Bug: 166295507
Merged-In: I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6
Change-Id: I5667593cf89e4432861a5033ea57281507ddce74