aries: Enable proximity wake option

Change-Id: I99a6c475e533b27429b265407d58a05fcac80d2d
Merge branch 'cm-11.0' into stable/cm-11.0