Merge 24Q3 (ab/11976889) to aosp-main-future

Bug: 347831320
Merged-In: I40f5e3eb49ebd1ca212c182d65c5b67f1e879d57
Change-Id: I7150234fcbe1cbeebf236b5cc9b070c13fac3345
diff --git a/proguard.cfg b/proguard.cfg
index 4ff3790..222c182 100644
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -24,9 +24,3 @@
 -keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
-
-# Keep annotated classes or class members.
--keep @androidx.annotation.Keep class *
--keepclassmembers class * {
-    @androidx.annotation.Keep *;
-}