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

Bug: 166295507
Merged-In: I531ba3c01b643f86d4c68c781669068cacf71dce
Change-Id: I98b9f287a2881ec98f6f69d6089fa0190a0ee2fe