am e2b102de: (-s ours) am 28580b4d: Remove Search from the system Settings app DO NOT MERGE

Merge commit 'e2b102de6723b06d26dd5df986884881f72335ea'

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