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

Bug: 166295507
Merged-In: I0af7dcf183c7ffe110590e539177bbc7ff69cb27
Change-Id: I4c6584a78c1296b9fe65edeafe7aba3f143f3b56