Merge change 20357

* changes:
  Remove Voice Search constants, factored them out into the Voice Search app.