diff --git a/apex/media/framework/java/android/media/MediaSession2.java b/apex/media/framework/java/android/media/MediaSession2.java
index cb6e1a0b202a6..7d07eb35832e4 100644
--- a/apex/media/framework/java/android/media/MediaSession2.java
+++ b/apex/media/framework/java/android/media/MediaSession2.java
@@ -302,8 +302,9 @@ public class MediaSession2 implements AutoCloseable {
             parcel.setDataPosition(0);
             Bundle out = parcel.readBundle(null);
 
-            // Calling Bundle#size() will trigger Bundle#unparcel().
-            out.size();
+            for (String key : out.keySet()) {
+                out.get(key);
+            }
         } catch (BadParcelableException e) {
             Log.d(TAG, "Custom parcelable in bundle.", e);
             return true;
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index 20fa53d3ec328..bc00c404b11e4 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -657,8 +657,9 @@ public final class MediaSession {
             parcel.setDataPosition(0);
             Bundle out = parcel.readBundle(null);
 
-            // Calling Bundle#size() will trigger Bundle#unparcel().
-            out.size();
+            for (String key : out.keySet()) {
+                out.get(key);
+            }
         } catch (BadParcelableException e) {
             Log.d(TAG, "Custom parcelable in bundle.", e);
             return true;