Merge "MediaBrowserCompat: Make ItemCallback can take a null media item" into nyc-support-24.1-dev