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

Bug: 166295507
Merged-In: If59a1a4a9c779b41916cbea378d885e1295ac15c
Change-Id: I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d