am 890231f1: Merge change 7934 into donut

Merge commit '890231f1d5912f5b71371e73f44df2db2e741b1b'

* commit '890231f1d5912f5b71371e73f44df2db2e741b1b':
  Unhide new SearchManager APIs for Donut.