am 9c1b1872: Merge change 4908 into donut

Merge commit '9c1b1872faf028bcd70fb3e17eeb29d86ce6bd9a'

* commit '9c1b1872faf028bcd70fb3e17eeb29d86ce6bd9a':
  Remove checks for Activity Context when creating SearchManager