serrano: Enable proximity wake option

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