diff --git a/arch/x86/crypto/TEST_MAPPING b/arch/x86/crypto/TEST_MAPPING
index c4a3225f8146..50de433ae94f 100644
--- a/arch/x86/crypto/TEST_MAPPING
+++ b/arch/x86/crypto/TEST_MAPPING
@@ -298,6 +298,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/arch/x86/include/asm/TEST_MAPPING b/arch/x86/include/asm/TEST_MAPPING
index 421c0e398b73..1d41e064ec5c 100644
--- a/arch/x86/include/asm/TEST_MAPPING
+++ b/arch/x86/include/asm/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/arch/x86/kernel/fpu/TEST_MAPPING b/arch/x86/kernel/fpu/TEST_MAPPING
index 1f107076f96e..9bc5e2be0540 100644
--- a/arch/x86/kernel/fpu/TEST_MAPPING
+++ b/arch/x86/kernel/fpu/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/block/TEST_MAPPING b/block/TEST_MAPPING
index 0e738f706ecf..1268c221b87f 100644
--- a/block/TEST_MAPPING
+++ b/block/TEST_MAPPING
@@ -330,6 +330,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/android/TEST_MAPPING b/drivers/android/TEST_MAPPING
index 5fd3e3d44bf8..6b4f697837cd 100644
--- a/drivers/android/TEST_MAPPING
+++ b/drivers/android/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/base/TEST_MAPPING b/drivers/base/TEST_MAPPING
index 7723baff71cd..cf82c9fe67ae 100644
--- a/drivers/base/TEST_MAPPING
+++ b/drivers/base/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/block/TEST_MAPPING b/drivers/block/TEST_MAPPING
index f59ad3f12261..653e195a0517 100644
--- a/drivers/block/TEST_MAPPING
+++ b/drivers/block/TEST_MAPPING
@@ -256,6 +256,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/char/TEST_MAPPING b/drivers/char/TEST_MAPPING
index 5fd3e3d44bf8..6b4f697837cd 100644
--- a/drivers/char/TEST_MAPPING
+++ b/drivers/char/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/dma-buf/TEST_MAPPING b/drivers/dma-buf/TEST_MAPPING
index 210b8fe79c6f..10f02f3f7a27 100644
--- a/drivers/dma-buf/TEST_MAPPING
+++ b/drivers/dma-buf/TEST_MAPPING
@@ -305,6 +305,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/md/TEST_MAPPING b/drivers/md/TEST_MAPPING
index 8dfa1ca83ec0..d44e7cd5d29c 100644
--- a/drivers/md/TEST_MAPPING
+++ b/drivers/md/TEST_MAPPING
@@ -307,6 +307,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/net/TEST_MAPPING b/drivers/net/TEST_MAPPING
index eb47564444aa..146d13394294 100644
--- a/drivers/net/TEST_MAPPING
+++ b/drivers/net/TEST_MAPPING
@@ -313,6 +313,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/virtio/TEST_MAPPING b/drivers/virtio/TEST_MAPPING
index f3f4bd7ad110..4649a9dd1bb6 100644
--- a/drivers/virtio/TEST_MAPPING
+++ b/drivers/virtio/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/fs/TEST_MAPPING b/fs/TEST_MAPPING
index 1509dc2a9960..58eaa367e190 100644
--- a/fs/TEST_MAPPING
+++ b/fs/TEST_MAPPING
@@ -325,6 +325,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/include/asm-generic/TEST_MAPPING b/include/asm-generic/TEST_MAPPING
index 6cfbbd8b8656..76470c7eb9af 100644
--- a/include/asm-generic/TEST_MAPPING
+++ b/include/asm-generic/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/include/crypto/TEST_MAPPING b/include/crypto/TEST_MAPPING
index 8b3c9150a8d1..4d2e4f12264c 100644
--- a/include/crypto/TEST_MAPPING
+++ b/include/crypto/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/include/drm/TEST_MAPPING b/include/drm/TEST_MAPPING
index 6b9eb3f33d93..819c308bae8b 100644
--- a/include/drm/TEST_MAPPING
+++ b/include/drm/TEST_MAPPING
@@ -313,6 +313,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/include/linux/TEST_MAPPING b/include/linux/TEST_MAPPING
index 0e738f706ecf..1268c221b87f 100644
--- a/include/linux/TEST_MAPPING
+++ b/include/linux/TEST_MAPPING
@@ -330,6 +330,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/include/net/TEST_MAPPING b/include/net/TEST_MAPPING
index 3c83d071e0de..867f24876046 100644
--- a/include/net/TEST_MAPPING
+++ b/include/net/TEST_MAPPING
@@ -330,6 +330,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/include/trace/TEST_MAPPING b/include/trace/TEST_MAPPING
index 9ddfd03012cd..21d478640bd2 100644
--- a/include/trace/TEST_MAPPING
+++ b/include/trace/TEST_MAPPING
@@ -330,6 +330,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/include/uapi/linux/TEST_MAPPING b/include/uapi/linux/TEST_MAPPING
index 7317fc839f85..661d33980640 100644
--- a/include/uapi/linux/TEST_MAPPING
+++ b/include/uapi/linux/TEST_MAPPING
@@ -302,6 +302,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/include/vdso/TEST_MAPPING b/include/vdso/TEST_MAPPING
index 6a198c0cd7d5..b0912ef18ef5 100644
--- a/include/vdso/TEST_MAPPING
+++ b/include/vdso/TEST_MAPPING
@@ -311,6 +311,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/kernel/bpf/TEST_MAPPING b/kernel/bpf/TEST_MAPPING
index 268a967523e2..b71704467c51 100644
--- a/kernel/bpf/TEST_MAPPING
+++ b/kernel/bpf/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/kernel/cgroup/TEST_MAPPING b/kernel/cgroup/TEST_MAPPING
index 268a967523e2..b71704467c51 100644
--- a/kernel/cgroup/TEST_MAPPING
+++ b/kernel/cgroup/TEST_MAPPING
@@ -322,6 +322,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/kernel/sched/TEST_MAPPING b/kernel/sched/TEST_MAPPING
index 03cc86c027b2..603cb5cea199 100644
--- a/kernel/sched/TEST_MAPPING
+++ b/kernel/sched/TEST_MAPPING
@@ -311,6 +311,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
diff --git a/mm/TEST_MAPPING b/mm/TEST_MAPPING
index 128beb118cd6..70b597e11413 100644
--- a/mm/TEST_MAPPING
+++ b/mm/TEST_MAPPING
@@ -293,6 +293,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/net/TEST_MAPPING b/net/TEST_MAPPING
index d474e3c761f4..c30cffa00418 100644
--- a/net/TEST_MAPPING
+++ b/net/TEST_MAPPING
@@ -309,6 +309,14 @@
     },
     {
       "name": "CtsUsbTests"
+    },
+    {
+      "name": "CtsDrmTestCases",
+      "options": [
+        {
+          "exclude-filter": "android.drm.cts.DRMTest#testForwardLockAccess"
+        }
+      ]
     }
   ]
 }