diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index 097609e6e428b..c12d897b9d726 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -57,6 +57,10 @@ package android.media.session {
     field public static final int FLAG_EXCLUSIVE_GLOBAL_PRIORITY = 65536; // 0x10000
   }
 
+  public static final class MediaSession.Token implements android.os.Parcelable {
+    method public int getUid();
+  }
+
   public final class MediaSessionManager {
     method public void dispatchMediaKeyEventAsSystemService(@NonNull android.view.KeyEvent);
     method public boolean dispatchMediaKeyEventAsSystemService(@NonNull android.media.session.MediaSession.Token, @NonNull android.view.KeyEvent);
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index 549e793531337..624607b61b8f4 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -828,9 +828,10 @@ public final class MediaSession {
         }
 
         /**
-         * Gets the UID of this token.
+         * Gets the UID of the application that created the media session.
          * @hide
          */
+        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
         public int getUid() {
             return mUid;
         }
diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt
index 1bbbf983b5aaa..f7f42d0a59562 100644
--- a/non-updatable-api/module-lib-current.txt
+++ b/non-updatable-api/module-lib-current.txt
@@ -57,6 +57,10 @@ package android.media.session {
     field public static final int FLAG_EXCLUSIVE_GLOBAL_PRIORITY = 65536; // 0x10000
   }
 
+  public static final class MediaSession.Token implements android.os.Parcelable {
+    method public int getUid();
+  }
+
   public final class MediaSessionManager {
     method public void dispatchMediaKeyEventAsSystemService(@NonNull android.view.KeyEvent);
     method public boolean dispatchMediaKeyEventAsSystemService(@NonNull android.media.session.MediaSession.Token, @NonNull android.view.KeyEvent);