Revert "Revert "Single pane for 10" Settings""

This reverts commit 9d4d00d1a2ffc1c8691b3dae9f74dc9dd7866ff8.

Conflicts:
	res/layout/app_ops_details.xml
	src/com/android/settings/Settings.java

Change-Id: Id4496b4d506fb7a6469eb3029d9bdbbabf4cb0e3
More fixes related to Tentacles

Change-Id: Ibe70527bf2526bb15c5b377b4282275f8755f322
Re-add profiles UI.

Change-Id: I8abfa71dcc0f8a3889922b70d27c941fc8d0ac70

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/styles.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/Utils.java
More fixes

Change-Id: I56015791fe5a66aea55c92ecfcbd5e3092b178d0