am 8fdaff05: am f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE

Merge commit '8fdaff05d1154c93b467b9647b8fc2702eca1699' into gingerbread-plus-aosp

* commit '8fdaff05d1154c93b467b9647b8fc2702eca1699':
  Remove Search from the system Settings app DO NOT MERGE