Settings: add TouchControl package
Display settings: reorganize

-create a wakeup category now that we have so many wake up related options
-create a general category for various options
-move screen color options into display category with brightness
-rename some categories
-little clean up in DisplaySettings.java
Settings : Make proximity opt-in

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec
Follow normal lock screen convention - allow user to retry when creating pattern lock

Change-Id: I6ad39b07b8de3de03146322b37b60e3f846093d1