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

Bug: 166295507
Merged-In: I9aa34c701c165c4b37ff580a0c70668f8665e7f8
Change-Id: Ibc9182f24b151d65d15559af96a2039cf076d380