am 2a1aa6ac: Merge change 7970 into donut

Merge commit '2a1aa6acbba5a3a9142d3e8bd6fe6e19d5fae6be'

* commit '2a1aa6acbba5a3a9142d3e8bd6fe6e19d5fae6be':
  Define a broadcast intent for the web search provider changing. Unhide