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

Bug: 166295507
Merged-In: I43f058ccc394bba30d45d77fae8732fe1a2ab0c0
Change-Id: I27a66e24702f3a8a96b213e4680e20e8be35e477