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

Bug: 166295507
Merged-In: I0d83429a02c4b72bf9bee84e8817641b2fae5eeb
Change-Id: I688cf9a8010c1def4043e5b1caa819dbf18da5f4