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

Bug: 166295507
Merged-In: I27c2ede56c89e9145b6f1a5cdd349fe37d3a229b
Change-Id: Ia4f3ce3113c6199975c391de8fbcf828cca63f13