Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev