From 7d08344e9b061a93e6c1a55eef55b99c9c46452f Mon Sep 17 00:00:00 2001
From: Raman Tenneti <rtenneti@google.com>
Date: Fri, 22 Mar 2019 18:08:22 +0000
Subject: [PATCH] Revert "AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE :=
 device-tests to fix "Missing test_suite setting for test"."

This reverts commit bada9f9b46ecd526e478d343eeb80f97962fb0eb.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I17281de5c14e7c285d263729167f208cbea4f7d5
---
 Android.mk     | 2 --
 proguard.flags | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/Android.mk b/Android.mk
index 8eab88c..b21b98f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -70,8 +70,6 @@ LOCAL_CERTIFICATE := platform
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/proguard.flags b/proguard.flags
index ff83f12..44f6ccd 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -21,9 +21,6 @@
 -keepclassmembers class * {
   @com.google.common.annotations.VisibleForTesting *;
 }
--keepclassmembers class * {
-  @com.android.messaging.ui.contact.ContactPickerFragment *;
-}
 
 # Keep methods that have the @VisibleForAnimation annotation
 -keep @interface com.android.messaging.annotation.VisibleForAnimation