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

Bug: 166295507
Merged-In: If0012214cee84d7e317b338d99778cdfb08b8cf4
Change-Id: I13bd92e0dd2a3a4094a7c8e19097a88a94b147b2