Fix test failures from enum unboxing and signature removal

Change-Id: Ifa3553a6779619afc9220c366cc87b2e21a2f82f

src/main/java/com/android/tools/r8/shaking/KeepInfo.java

diff --git a/src/main/java/com/android/tools/r8/shaking/KeepInfo.java b/src/main/java/com/android/tools/r8/shaking/KeepInfo.java
index 977f1cd..3e5246d 100644
--- a/src/main/java/com/android/tools/r8/shaking/KeepInfo.java
+++ b/src/main/java/com/android/tools/r8/shaking/KeepInfo.java
@@ -174,8 +174,9 @@
     if (!configuration.isKeepAttributesSignatureEnabled()) {
       return true;
     }
-    return !(configuration.isForceProguardCompatibilityEnabled()
-        || !isShrinkingAllowed(configuration));
+    return !configuration.isForceProguardCompatibilityEnabled()
+        && internalIsOptimizationAllowed()
+        && internalIsShrinkingAllowed();
   }
 
   public boolean isEnclosingMethodAttributeRemovalAllowed(

src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java

diff --git a/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java
index db8a047..5ee7900 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java
@@ -33,7 +33,7 @@
         .addInnerClasses(NullValuedFieldEnumUnboxingTest.class)
         .addKeepMainRule(Main.class)
         .addKeepRules(enumKeepRules.getKeepRules())
-        .addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
+        .addEnumUnboxingInspector(inspector -> inspector.assertNotUnboxed(MyEnum.class))
         .setMinApi(parameters.getApiLevel())
         .compile()
         .run(parameters.getRuntime(), Main.class)