Merge cherrypicks of [14194721] into sparse-7281572-L18800000859538429

Change-Id: Ied27c26ccf09a82765f55b018445140e7132fcd2

proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 13425ce..7f8f207 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -9,7 +9,7 @@
 }
 
 -keepclassmembers public class * extends com.android.networkstack.util.Struct {
-    public <init>(...);
+    *;
 }
 
 # The lite proto runtime uses reflection to access fields based on the names in