[Media>UI] Don't call onServiceStarted when handling a notification action

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
index ce662d7e8b3e1ab9a5d1661c80bceb73acd5454a..01c791d7718515f67e5a2fa88122a78ac04111a4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
@@ -190,9 +190,15 @@ public class MediaNotificationManager {
             MediaNotificationManager manager = getManager();
             if (manager == null || manager.mMediaNotificationInfo == null) return false;
 
-            manager.onServiceStarted(this);
-
-            processAction(intent, manager);
+            if (intent.getAction() == null) {
+                // The intent comes from {@link startService()} or
+                // {@link startServiceWithNotification}.
+                manager.onServiceStarted(this);
+            } else {
+                // The intent comes from the notification. In this case, {@link onServiceStarted()}
+                // does need to be called.
+                processAction(intent, manager);
+            }
             return true;
         }
 
@@ -616,6 +622,8 @@ public class MediaNotificationManager {
      * @param service the service that was started
      */
     private void onServiceStarted(ListenerService service) {
+        if (mService == service) return;
+
         mService = service;
         updateNotification();
     }