Merge "Land CTS tests to MediaBrowserCompat.MediaItem" into nyc-support-25.2-dev am: 6f0cbe1aa9
am: 7952c39ba1

Change-Id: If7374d8b9f79c9cac336fc7e57c69f6c14b08aec