Remove CM's tap-to-wake option if Screen off gestures is installed

Change-Id: I05c952f6fc05108edbad92f21aecbb6bd881bea2

Conflicts:
	src/com/android/settings/DisplaySettings.java