Disable AppOps for real.

Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1

Conflicts:
	AndroidManifest.xml
Merge tag 'android-4.3.1_r1' into jb431

Android 4.3.1 Release 1

# gpg: Signature made Mon 07 Oct 2013 01:39:31 PM CDT using DSA key ID 9AB10E78
# gpg: Can't check signature: No public key