diff --git a/api/current.txt b/api/current.txt
index c5c4e2a7ce8cf..b5ce2b10353bd 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20658,6 +20658,7 @@ package android.media {
     field public static final int HEVCProfileMain10HDR10 = 4096; // 0x1000
     field public static final int MPEG2LevelH14 = 2; // 0x2
     field public static final int MPEG2LevelHL = 3; // 0x3
+    field public static final int MPEG2LevelHP = 4; // 0x4
     field public static final int MPEG2LevelLL = 0; // 0x0
     field public static final int MPEG2LevelML = 1; // 0x1
     field public static final int MPEG2Profile422 = 2; // 0x2
@@ -20671,9 +20672,11 @@ package android.media {
     field public static final int MPEG4Level1 = 4; // 0x4
     field public static final int MPEG4Level2 = 8; // 0x8
     field public static final int MPEG4Level3 = 16; // 0x10
+    field public static final int MPEG4Level3b = 24; // 0x18
     field public static final int MPEG4Level4 = 32; // 0x20
     field public static final int MPEG4Level4a = 64; // 0x40
     field public static final int MPEG4Level5 = 128; // 0x80
+    field public static final int MPEG4Level6 = 256; // 0x100
     field public static final int MPEG4ProfileAdvancedCoding = 4096; // 0x1000
     field public static final int MPEG4ProfileAdvancedCore = 8192; // 0x2000
     field public static final int MPEG4ProfileAdvancedRealTime = 1024; // 0x400
diff --git a/api/system-current.txt b/api/system-current.txt
index 3efe0818043d6..876dfa8245a91 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -22176,6 +22176,7 @@ package android.media {
     field public static final int HEVCProfileMain10HDR10 = 4096; // 0x1000
     field public static final int MPEG2LevelH14 = 2; // 0x2
     field public static final int MPEG2LevelHL = 3; // 0x3
+    field public static final int MPEG2LevelHP = 4; // 0x4
     field public static final int MPEG2LevelLL = 0; // 0x0
     field public static final int MPEG2LevelML = 1; // 0x1
     field public static final int MPEG2Profile422 = 2; // 0x2
@@ -22189,9 +22190,11 @@ package android.media {
     field public static final int MPEG4Level1 = 4; // 0x4
     field public static final int MPEG4Level2 = 8; // 0x8
     field public static final int MPEG4Level3 = 16; // 0x10
+    field public static final int MPEG4Level3b = 24; // 0x18
     field public static final int MPEG4Level4 = 32; // 0x20
     field public static final int MPEG4Level4a = 64; // 0x40
     field public static final int MPEG4Level5 = 128; // 0x80
+    field public static final int MPEG4Level6 = 256; // 0x100
     field public static final int MPEG4ProfileAdvancedCoding = 4096; // 0x1000
     field public static final int MPEG4ProfileAdvancedCore = 8192; // 0x2000
     field public static final int MPEG4ProfileAdvancedRealTime = 1024; // 0x400
diff --git a/api/test-current.txt b/api/test-current.txt
index 4b7373ed714af..301c1b2c61d62 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -20728,6 +20728,7 @@ package android.media {
     field public static final int HEVCProfileMain10HDR10 = 4096; // 0x1000
     field public static final int MPEG2LevelH14 = 2; // 0x2
     field public static final int MPEG2LevelHL = 3; // 0x3
+    field public static final int MPEG2LevelHP = 4; // 0x4
     field public static final int MPEG2LevelLL = 0; // 0x0
     field public static final int MPEG2LevelML = 1; // 0x1
     field public static final int MPEG2Profile422 = 2; // 0x2
@@ -20741,9 +20742,11 @@ package android.media {
     field public static final int MPEG4Level1 = 4; // 0x4
     field public static final int MPEG4Level2 = 8; // 0x8
     field public static final int MPEG4Level3 = 16; // 0x10
+    field public static final int MPEG4Level3b = 24; // 0x18
     field public static final int MPEG4Level4 = 32; // 0x20
     field public static final int MPEG4Level4a = 64; // 0x40
     field public static final int MPEG4Level5 = 128; // 0x80
+    field public static final int MPEG4Level6 = 256; // 0x100
     field public static final int MPEG4ProfileAdvancedCoding = 4096; // 0x1000
     field public static final int MPEG4ProfileAdvancedCore = 8192; // 0x2000
     field public static final int MPEG4ProfileAdvancedRealTime = 1024; // 0x400
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 08c184270d5b0..87c6d88a0c113 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -2636,12 +2636,10 @@ public final class MediaCodecInfo {
         public static final int MPEG4Level1      = 0x04;
         public static final int MPEG4Level2      = 0x08;
         public static final int MPEG4Level3      = 0x10;
-        /** @hide */
         public static final int MPEG4Level3b     = 0x18;
         public static final int MPEG4Level4      = 0x20;
         public static final int MPEG4Level4a     = 0x40;
         public static final int MPEG4Level5      = 0x80;
-        /** @hide */
         public static final int MPEG4Level6      = 0x100;
 
         // from OMX_VIDEO_MPEG2PROFILETYPE
@@ -2657,7 +2655,6 @@ public final class MediaCodecInfo {
         public static final int MPEG2LevelML     = 0x01;
         public static final int MPEG2LevelH14    = 0x02;
         public static final int MPEG2LevelHL     = 0x03;
-        /** @hide */
         public static final int MPEG2LevelHP     = 0x04;
 
         // from OMX_AUDIO_AACPROFILETYPE