Add LCD density setting

Change-Id: I14fbab6fc504709022859d4508a9d330be7427e4

Conflicts:
	src/com/android/settings/DisplaySettings.java

Conflicts:
	src/com/android/settings/DisplaySettings.java