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

Bug: 166295507
Merged-In: I026923360abee43c063ee7fb0f7557da8ffb8548
Change-Id: I199d6c981fd950b4335cc6141b328b9ec5da03de