nicki: Enable volume rocker wake option

Change-Id: I2416738e2d4b4ccc4b334b4e838cb13778e23710
Merge remote-tracking branch 'cm/cm-11.0' into HEAD