ProximityWake : Add support for checking proximity when waking device [2/2]

Change-Id: I5e584da2a6c48da88639706f6df50a96fd1be3b6

Conflicts:
	res/values/kang_strings.xml

Conflicts:
	res/values/liquid_strings.xml
	res/xml/display_settings.xml
Settings: Add LCD density setting (2/2)

Change-Id: Id6d970b8e82321b3109573d01343e73806baa1c4

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/util/CMDProcessor.java
	src/com/android/settings/util/Helpers.java