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

Bug: 166295507
Merged-In: I8d84faf48c0236373fcd6bed3e8355dfb50ddee5
Change-Id: I6572157ab6f75fefb67d7fbc24e9529df8c17743