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

Bug: 166295507
Merged-In: Ia4252557017a3f7dc4e40a4e006994becdcfc77f
Change-Id: Iaf511a01e9a73da3d82251eae2ea49f39f78627d