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

This reverts commit 9d4d00d1a2ffc1c8691b3dae9f74dc9dd7866ff8.

Conflicts:

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