Revert "g2: update TapToWake for nameless"

because this is causing Display & Lights settings force closes due to NPE.

will fix later when more time available

This reverts commit d1f72d873b270bcdcafe5db6d5b1c2b5b89e6606.

Change-Id: I711cb96b12ac60962891cd9ea335c6d540729ece