Revert^2 "Use optimized resource shrinking for SystemUI"

This reverts commit 19d90529cfbaa0f2fd7e58312f89c0ae553f8326.

Reason for revert: roll-forward, tracked down issue to duplicate keep.xml files. Issue has been fixed by renaming one of the files.

Change-Id: I6dcfee7807dab11918082fbd6c4dec90ce715680
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index d50b596..b48cac5 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -420,6 +420,7 @@
     kotlincflags: ["-Xjvm-default=all"],
     optimize: {
         shrink_resources: false,
+        optimized_shrink_resources: false,
         proguard_flags_files: ["proguard.flags"],
     },
 
@@ -477,6 +478,7 @@
                 optimize: true,
                 shrink: true,
                 shrink_resources: true,
+                optimized_shrink_resources: true,
                 ignore_warnings: false,
                 proguard_compatibility: false,
             },