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

Change-Id: I689e04178198f0caf8542cbf21fe8ebe4595134c