Merge "MediaBrowserServiceCompat: Make SubscriptionCallback.onError be called" into nyc-support-25.2-dev