Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Settings into jb-mr1

Android 4.2.2 release 1

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/ChooseLockPatternTutorial.java

Signed-off-by: iceandfire <arhamjamal@gmail.com>