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

Bug: 166295507
Merged-In: I6b5bbcb33d827a09bdd6eec24d1add27a4380e24
Change-Id: Ic7867918af6a3a5a8425ffd0ff44d0e44a05fe24