am 28580b4d: Remove Search from the system Settings app DO NOT MERGE

Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp

* commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9':
  Remove Search from the system Settings app DO NOT MERGE