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

Bug: 166295507
Merged-In: I85473f8be0942c0636097038cd447aed2b4c6dc1
Change-Id: I8c5ee0f658f8387fecfef7c4d977fa12e094d3ae