Privacy Guard options

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: Ibd41bdc42ca37ceed846c1a67e5abe5bf6c86813

Conflicts:
	core/java/android/provider/Settings.java