Revert "serrano: Enable proximity wake option"

 * Some people complain it messes up screen on/off
   during calls. Turn it off by default and let those
   that wants it turn it on manually.

This reverts commit 785f0906a46bcaddae9e1d8e3fad40d7d97fcdb2.

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