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

Bug: 166295507
Merged-In: Ic08b97c9660daee8bd69db381ea55234d37a0106
Change-Id: Ib83cd87683ae896de789cdf6cd0c801562a191d5