HammerHead : Add proximity wake flag

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml

Change-Id: I16a69d2c236802ce66c7de437ed83d630a4ab721
Merge remote-tracking branch 'upstream/kitkat' into kitkat