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

Bug: 166295507
Merged-In: Ice8deea93919c5c2b33395f82592e44c88989b28
Change-Id: Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684