am cd540294: Merge change 9704 into donut

Merge commit 'cd540294db39d6dd2b2c228ac190684c3970fe0a'

* commit 'cd540294db39d6dd2b2c228ac190684c3970fe0a':
  Close the search dialog before starting voice search in all cases, i.e.,