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

Bug: 166295507
Merged-In: I868dcbbf0785c9ef05e4c794d9ab8483ced2cd6d
Change-Id: I76a40f211cb9022b7ee1c372266c8cc1e2537e57