Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/packages/apps/Settings into jb3

Android 4.3 Release 3.1