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

Bug: 166295507
Merged-In: I6447f0dc7fc7cba37bacc75bcb21d75aa5033ef1
Change-Id: Iac885e1070f3f72af7b64b13e7046eed90e01eb8