Merge tag 'android-4.2.2_r1' into HEAD

Android 4.2.2 release 1

Conflicts:
	AndroidManifest.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/settings/Settings.java

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

Change-Id: I5d45aeb8ca18ab47d04ef4014beacf75055b94f9
Derp Fix

Change-Id: Ieb33b3d19b24d32a8d6d4d7e218c4ad8e0e5a344