Disable AppOps for real.

Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1

Conflicts:
	AndroidManifest.xml
Merge tag 'android-4.3.1_r1' of https://github.com/android/platform_packages_apps_settings into cm-10.2

Android 4.3.1 Release 1