Revert "Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/packages/apps/Settings into jb-devel-mr2-release"

This reverts commit b3795d8a16f65c1b803c0620176ff7ed898f5525, reversing
changes made to 469c583b22d6af78800c410e40339556e5fc8457.