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

Android 4.2.2 release 1