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

Bug: 166295507
Merged-In: I2fd77533987528dafbbcd5e01c9b44a424f70ddf
Change-Id: I00a0930452a689304126c64ce8dd6ed837ff9b74