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

Change-Id: I5e584da2a6c48da88639706f6df50a96fd1be3b6

Conflicts:
	res/values/kang_strings.xml