Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I8b17055275fa2165d375a89571106790cb320cf5
diff --git a/proguard.flags b/proguard.flags
index f88d37f..6f1d07a 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -25,6 +25,6 @@
   *** setAnimatedHeightFraction(...);
 }
 
--keepclasseswithmembers class * extends com.android.mail.ui.ConversationSpecialItemView {
+-keepclasseswithmembers class * implements com.android.mail.ui.ConversationSpecialItemView {
   *** setAnimatedHeight(...);
 }