Merge "MediaBrowserServiceCompat: Make SubscriptionCallback.onError be called"