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

Bug: 166295507
Merged-In: I32fccdb114ef7fa2fc30ba7a19f8a4d711ba90ac
Change-Id: I05bf001a541c36cea285a3ee33b0ede8403c271d