Merge "Increase timeout of ActivityMetricsLaunchObserverTests"