m7: DeviceSettings: Flick/Pick2Wake options added

Conflicts:
	rootdir/etc/init.qcom.rc

Change-Id: Ibdc1cbaca9036fb19fb031ad2587b79cbac507ce
Revert "m7: send phone apps status to proximity sensor"

    This reverts commit aa4e2481c9b1cd4247b8d2d77316829ff9573d8f.

Change-Id: Ia2410dd2069c66083771ae758cc2ac2aeaa946f9