HammerHead : Add proximity wake flag

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

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

Change-Id: Ib1cfb2e14e1b487f19c84acd9451fe4eef2d9976