Merge "Don't pass media app extras back to them" into pi-car-dev am: a24a8be467 am: 8745c3a669 am: fed386aab7 am: 5a7a61b249

Change-Id: I5f85896ba2af25841e49553a350b909546a6f26f
diff --git a/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java b/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
index 4e9957a..95c0dd5 100644
--- a/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
+++ b/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
@@ -615,8 +615,9 @@
          */
         public void playItem(MediaItemMetadata item) {
             if (mMediaController != null) {
-                mMediaController.getTransportControls().playFromMediaId(item.getId(),
-                        item.getExtras());
+                // Do NOT pass the extras back as that's not the official API and isn't supported
+                // in media2, so apps should not rely on this.
+                mMediaController.getTransportControls().playFromMediaId(item.getId(), null);
             }
         }