Dual panel for settings (2/2)

Change-Id: Icbfbd4a713592a3be9d5afff5a38fb07f6b8f2cf

Conflicts:

	src/com/android/settings/DisplaySettings.java