fix conflict

Author: leotianlizhan

firebase-perf/src/main/java/com/google/firebase/perf/application/FrameMetricsRecorder.java

@@ -95,10 +95,6 @@ public Optional<PerfFrameMetrics> stop() {
       fragmentSnapshotMap.clear();
     }
     Optional<PerfFrameMetrics> data = this.snapshot();
-    /**
-     * {@link FrameMetricsAggregator#remove(Activity)} will throw exceptions for hardware
-     * acceleration disabled activities.
-     */
     try {
       frameMetricsAggregator.remove(activity);
     } catch (IllegalArgumentException err) {