Merge "MediaBrowserCompat: Use support library implementation for API 24 and 25" into nyc-support-25.2-dev