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

Change-Id: Ie220376550d55189a28c5a820b57e00f33c1210f