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

Change-Id: I6d249919852f0c9ea40b5a38142dbb3164b4164c