Revert "Framework: Dual Pane Settings"

This reverts commit badcdfa66aa23b1fa3d0d25552fa8a25354698db.

Conflicts:
	core/java/android/provider/Settings.java
Revert "Fix custom carrier label logic derp"

This reverts commit 886aaf9fdf8d9911ca385a8ebfc1f9745d8febc2.