Merge branch 'remix-legacy' of https://github.com/AOSPAL/android_packages_apps_Settings into darkparanoid

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml