Merge old branch 'jellybean' of https://github.com/PAC-man/android_packages_apps_Settings into jellybean

Change-Id: Ic034e5af414bf446d264a4c6c4cdeb3be078a8ac