HammerHead : Add proximity wake flag

Change-Id: I78e677b20a03977d8180726dc64283658ce9c5f9
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0

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