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

Bug: 166295507
Merged-In: I69a69f0bd988eedd220f8aaab9932e871fe8a2c0
Change-Id: I32a7ca28f66d8350a9a1bebe88d5aa7481a4ce0b