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

Bug: 166295507
Merged-In: I351000b81430c58bde24de7de6e401a18ef29f56
Change-Id: Ib6931e3695458d743667dff2d59acfd156415019