Additional changes

Author: tejasd

firebase-perf/src/main/java/com/google/firebase/perf/session/PerfSession.java

@@ -40,9 +40,7 @@ public class PerfSession implements Parcelable {
   public static PerfSession createWithId(@NonNull String sessionId) {
     String prunedSessionId = sessionId.replace("-", "");
     PerfSession session = new PerfSession(prunedSessionId, new Clock());
-//    session.setGaugeAndEventCollectionEnabled(shouldCollectGaugesAndEvents());
-    // For testing.
-    session.setGaugeAndEventCollectionEnabled(true);
+    session.setGaugeAndEventCollectionEnabled(shouldCollectGaugesAndEvents());
 
     return session;
   }

firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/SecondActivity.kt

@@ -48,7 +48,6 @@ class SecondActivity : BaseActivity() {
         delay(1000)
         performanceTrace.stop()
       }
-
     }
     findViewById<Button>(R.id.kill_background_processes).setOnClickListener {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {