Bug 1234449 - Cleanup homescreen telemetry r=margaret

mobile/android/base/java/org/mozilla/gecko/home/HistoryPanel.java

@@ -358,7 +358,7 @@ public class HistoryPanel extends HomeFragment {
         final ClickableSpan clickableSpan = new ClickableSpan() {
             @Override
             public void onClick(View widget) {
-                Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.HOMESCREEN, "hint-private-browsing");
+                Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.PANEL, "hint-private-browsing");
                 try {
                     final JSONObject json = new JSONObject();
                     json.put("type", "Menu:Open");

mobile/android/search/java/org/mozilla/search/PreSearchFragment.java

@@ -110,7 +110,7 @@ public class PreSearchFragment extends Fragment {
                     final Rect startBounds = new Rect();
                     view.getGlobalVisibleRect(startBounds);
 
-                    Telemetry.sendUIEvent(TelemetryContract.Event.SEARCH, TelemetryContract.Method.HOMESCREEN, "history");
+                    Telemetry.sendUIEvent(TelemetryContract.Event.SEARCH, TelemetryContract.Method.SUGGESTION, "history");
 
                     searchListener.onSearch(query, new SuggestionAnimation() {
                         @Override