Remove logic for adding a search icon to action bar. am: a2dd9978d4
am: a7dd97a4c9

Change-Id: I4e1f2e9e792642257f538696afe8f9aca396cdbb