Call ParanoidOTA on system updates check

Change-Id: Ic4332fb223ef24b28a26b183a7e6b326a5bbb78c

Conflicts:

	src/com/android/settings/DeviceInfoSettings.java
Cleanup for commit f4a421a

* Fix brace style
* Change contentResolver
* Fix string key names and string language

Signed-off-by: Evan Anderson <evan1124@gmail.com>

PS3:

* Gerrit history changed, fixed conflicts for merging it.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

Change-Id: I82d90a54fbfe5bdc48d2ea32eebd671e0303b6f9
Merge "Call ParanoidOTA on system updates check" into kitkat
Revert "Disable AppOps for real."

This reverts commit 64b28a0dcc174827e551f4c7e71e4268bd0f5bba.
Spanish translation and a few of fixes to english ones

Change-Id: I2a4f25296f08852246e7c20bd7c55b58c425874e
Merge "Revert "Disable AppOps for real."" into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat