Revert "Use framework-res keep rules for modules"

This reverts commit 988487cf.

Reason for revert: Breaks git_master-art: b/285863158

Change-Id: I9421f905535839a857991f3b90bc3e85a9b74074
Bug: 285863158

proguard/Android.bp

@@ -39,12 +39,7 @@ java_defaults {
         obfuscate: false,
         proguard_compatibility: false,
         ignore_warnings: false,
-        proguard_flags_files: [
-            // Ensure classes referenced in the framework-res manifest
-            // and implemented by modules are kept.
-            ":framework-res{.aapt.proguardOptionsFile}",
-            ":framework-system-server-module-optimize-proguard-rules",
-        ],
+        proguard_flags_files: [":framework-system-server-module-optimize-proguard-rules"],
     },
 }
 
@@ -65,11 +60,6 @@ java_defaults {
         obfuscate: false,
         proguard_compatibility: false,
         ignore_warnings: false,
-        proguard_flags_files: [
-            // Ensure classes referenced in the framework-res manifest
-            // and implemented by modules are kept.
-            ":framework-res{.aapt.proguardOptionsFile}",
-            ":standalone-system-server-module-optimize-proguard-rules"
-        ],
+        proguard_flags_files: [":standalone-system-server-module-optimize-proguard-rules"],
     },
 }