Merge "MediaBrowserCompat: Make getItem work properly" into nyc-support-25.1-dev