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

Conflicts:
	res/xml/app_settings_headers.xml
Merge branch 'test' of https://github.com/JBMiniProject/android_packages_apps_Settings into test