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

Merge commit '2441c93def76c398eb3615f6109606dc021c4f27'

* commit '2441c93def76c398eb3615f6109606dc021c4f27':
  Remove Search from the system Settings app DO NOT MERGE