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

Bug: 166295507
Merged-In: Ia85b6f41af2746d4ba682ab08cdc8b614922d3b6
Change-Id: I948b08c082361c086de1088069a76ca1cc64ded6