shinano: update touchpad wake code

reconcile with aosp usage
fix d2w on aosp

Change-Id: I19731226c8558069da4ca8da2feff240034b1a53
Merge branch 'remote' into mkl