Disable AppOps for real.

Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1

Conflicts:
	AndroidManifest.xml
Merge tag 'android-4.3.1_r1' of https://android.googlesource.com/platform/packages/apps/Settings into jb-43

Android 4.3.1 Release 1