CM profiles [2/2]

Change-Id: I852bea61220970352cbf8c33f40f78ede08ca04a

Conflicts:
	AndroidManifest.xml
	res/layout/preference_icon.xml
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	res/values/styles.xml
	src/com/android/settings/Settings.java