Merge "Revert "AOD: Wake up fully on gestures by default"" into oc-dev
am: e76f4b0d0b

Change-Id: I5e699e5a290a3ff3baa944a5490e134fda860538