Merge change 5160 into donut

Merge change 5160 into donut

* changes:
  Return the url of a browser history item in the intent query column of the suggestion. This is so that global search can rewrite a query in the search dialog (i.e., fill in the search box with the url of the suggestion when the user rolls over to select the suggestion). Browser uses android:searchMode="rewriteQueryFromData" to accomplish this but global search does the default thing of using the intent query column, if present, as a rewrite for the current query.