Revert "Settings : Add preference for proximity wake"

This reverts commit e7e0ac284a6636e52e15d13c35b175e0bc563650.

Change-Id: Ia32b2e1d1cd52e54ffc20e7d6a5aabc6864d3f22
display_settings: move double tap to wake to proper category

Change-Id: I8baeeef6459444e80dc552eb6541b95424b3bac6
Highlight all search matches for the given constraint.

Change-Id: I9f1a58ee3e6cd59522c4705bedb1457473201d3c
Settings: Fix camel case

Change-Id: Ibc74affb90757f0680e9ce2aa15bc9c4596ec28b
Settings : Filter spam notifications

Change-Id: I4056aceada3cf8397827037bcb52388de9f8b9fc
fix icon reference

Change-Id: I4e6fbd0a4b3dd4ae893c9820951382759d680aeb
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4