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

Bug: 166295507
Merged-In: Ia6f397db17f229eee50939705459e0409fdebbbe
Change-Id: I30d8b775ff3b71258eb5ce6ead1ebb8e5b29c4de