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

Bug: 166295507
Merged-In: Ia849c0db28e6aafb8f7cd8d69987fc9854cff2fe
Change-Id: Iab6aa5e2dafdf1ff9629b35e4e2d77d4480b2c5b