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

Bug: 166295507
Merged-In: I6287bcf3941b664e1a2f35a066f20b14f4a6fb92
Change-Id: I40b78fbf47d811d43e3d1a1721120e5fe555c6d7