Revert "Revert "serrano: Enable proximity wake option""

This reverts commit 9b96aec70884806c8678576bbc457fb25f94b5c6.

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