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

Bug: 166295507
Merged-In: Iaca4fd52da6ff744f745bb835a1f58b9091063c5
Change-Id: I03454d7328b0c1fe58206f6dbb8dab3a6d5337f1