Merge changes Ie8685a12,I87abde9f

* changes:
  am: Add unit tests for ActivityMetricsLaunchObserver
  am: Add new LaunchObserver to track app launch sequences