Merge "Only resolve users on content:// Uris." into pi-dev
am: 766343cbbc

Change-Id: Ibc3d03e645e07324484a8a2f4db9832d042a07d3