diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index 73511c0f5b872..4ef4a2dd2db10 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -38,6 +38,10 @@ package android.media {
     field public static final int FLAG_FROM_KEY = 4096; // 0x1000
   }
 
+  public static final class MediaMetadata.Builder {
+    ctor public MediaMetadata.Builder(@NonNull android.media.MediaMetadata, @IntRange(from=1) int);
+  }
+
 }
 
 package android.media.session {
diff --git a/media/java/android/media/MediaMetadata.java b/media/java/android/media/MediaMetadata.java
index a23191f36efc1..523a072b957aa 100644
--- a/media/java/android/media/MediaMetadata.java
+++ b/media/java/android/media/MediaMetadata.java
@@ -15,8 +15,10 @@
  */
 package android.media;
 
+import android.annotation.IntRange;
 import android.annotation.NonNull;
 import android.annotation.StringDef;
+import android.annotation.SystemApi;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.ContentResolver;
 import android.graphics.Bitmap;
@@ -738,15 +740,16 @@ public final class MediaMetadata implements Parcelable {
 
         /**
          * Create a Builder using a {@link MediaMetadata} instance to set
-         * initial values, but replace bitmaps with a scaled down copy if they
-         * are larger than maxBitmapSize.
+         * initial values, but replace bitmaps with a scaled down copy if their width (or height)
+         * is larger than maxBitmapSize.
          *
          * @param source The original metadata to copy.
          * @param maxBitmapSize The maximum height/width for bitmaps contained
          *            in the metadata.
          * @hide
          */
-        public Builder(MediaMetadata source, int maxBitmapSize) {
+        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+        public Builder(@NonNull MediaMetadata source, @IntRange(from = 1) int maxBitmapSize) {
             this(source);
             for (String key : mBundle.keySet()) {
                 Object value = mBundle.get(key);
diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt
index d4c5e7ea375de..9e2dece400e32 100644
--- a/non-updatable-api/module-lib-current.txt
+++ b/non-updatable-api/module-lib-current.txt
@@ -38,6 +38,10 @@ package android.media {
     field public static final int FLAG_FROM_KEY = 4096; // 0x1000
   }
 
+  public static final class MediaMetadata.Builder {
+    ctor public MediaMetadata.Builder(@NonNull android.media.MediaMetadata, @IntRange(from=1) int);
+  }
+
 }
 
 package android.media.session {