Merge "Clear SearchView query field when collapsed as an action view"

core/java/android/widget/SearchView.java

@@ -1247,6 +1247,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
      */
     @Override
     public void onActionViewCollapsed() {
+        setQuery("", false);
         clearFocus();
         updateViewsVisibility(true);
         mQueryTextView.setImeOptions(mCollapsedImeOptions);