Merge "MediaBrowserCompat: Add a disconnecting state" into nyc-support-25.4-dev