diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 6ecf303c6dc89..dfc47587b91c4 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -140,7 +140,8 @@ android_library {
         "testables",
         "truth-prebuilt",
         "dagger2",
-        "jsr330"
+        "jsr330",
+        "WindowManager-Shell",
     ],
     libs: [
         "android.test.runner",
diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags
index 2a2ba1b0ccaad..14097b12e7303 100644
--- a/packages/SystemUI/proguard.flags
+++ b/packages/SystemUI/proguard.flags
@@ -39,4 +39,6 @@
 
 -keep public class * extends com.android.systemui.SystemUI {
     public <init>(android.content.Context);
-}
\ No newline at end of file
+}
+
+-keep class com.android.wm.shell.*
\ No newline at end of file