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

Bug: 166295507
Merged-In: I76b1212936706a196a76c84a54dfe05b8c4899e7
Change-Id: I652dcff381201dac9ad1984809def239c64dfd40