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

Bug: 166295507
Merged-In: I6d44eff89315b9fb0a032d9127c57e400f730305
Change-Id: I88973ad95767b663396ee6a7e7f586ce6fa9b123