HammerHead : Add proximity wake flag

Change-Id: I78e677b20a03977d8180726dc64283658ce9c5f9
Merge branch 'cm-11.0' into kk_mkt

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

Change-Id: I28ea996b30c977d046dc815c95d8175009b38aa2