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

Bug: 166295507
Merged-In: I6a07c809d90b8e567a3e5027b2eb4c499eeedb1b
Change-Id: I326820c4a876960b20b9fad780399cd4c451b6c5