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

Bug: 166295507
Merged-In: Ia304ff142efc0a4550772f5cea25ef55b781542d
Change-Id: I3c6248f1992b2d2eb1df18f1af5f75a68f8dbc16