Merge branch 'test' of https://github.com/JBMiniProject/android_packages_apps_Settings into test
Merge branch 'test' of https://github.com/JBMiniProject/android_packages_apps_Settings into test