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

Bug: 166295507
Merged-In: Icf5e0a7e5ca76ead5dd686a2c26da0f0db5e16f9
Change-Id: I2ed2c7209e2e6ce7364a8a6450c953a3920d8acb