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

Bug: 166295507
Merged-In: Iaf32fd4a6c83aeb7f50755af16559afa7b60fefc
Change-Id: I5f6aefff19c46967dc9e2f677828030dc137b7ce