Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/packages/apps/Settings into HEAD

Android 4.3 release 2.2