Merge "MediaBrowserCompat: Supplement JavaDoc of MediaItem.getMediaId()" into nyc-support-24.1-dev