Revert "Allow privileged apps to query contact provider across user" am: 94adfb0f85
am: 9324fca045

Change-Id: I528c2e567964947f30af28f3017aec7826177d80