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

Bug: 166295507
Merged-In: I56ccb7002a0f00000936ba02c1926fb4929ae34b
Change-Id: I9405533c2eee3323e5d1b87ca972759bceb29073