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

Bug: 166295507
Merged-In: I14d7f590626ed952689da92e72b4f0be8fff752f
Change-Id: I8f8254a06d6b6fdb726dbe8bcc162ef5a99fc546