Partial revert "add a config to remove the tap to wake preference by default (2/2)"

This partially reverts commit 4eebe311c9835a31f87266dacc6525fef1affe2b.

Change-Id: I6e6773b3a48b418ed757ca715bf672964fb9c290