Snap for 9263993 from dae72c844285f8efe8bc649f60088b53f3734bc2 to udc-d1-release

Change-Id: I24ce92044ae4fc6af3184893bb10535cb13c2263
diff --git a/src/android/support/v7/mms/MmsNetworkManager.java b/src/android/support/v7/mms/MmsNetworkManager.java
index 1021b5a..059ca8f 100644
--- a/src/android/support/v7/mms/MmsNetworkManager.java
+++ b/src/android/support/v7/mms/MmsNetworkManager.java
@@ -324,8 +324,7 @@
 
     private void registerConnectivityChangeReceiverLocked() {
         if (!mReceiverRegistered) {
-            mContext.registerReceiver(mConnectivityChangeReceiver, mConnectivityIntentFilter,
-                    Context.RECEIVER_EXPORTED/*UNAUDITED*/);
+            mContext.registerReceiver(mConnectivityChangeReceiver, mConnectivityIntentFilter);
             mReceiverRegistered = true;
         }
     }
diff --git a/src/com/android/messaging/BugleApplication.java b/src/com/android/messaging/BugleApplication.java
index 36f062b..0ef8d91 100644
--- a/src/com/android/messaging/BugleApplication.java
+++ b/src/com/android/messaging/BugleApplication.java
@@ -132,8 +132,7 @@
                 LogUtil.i(TAG, "Carrier config changed. Reloading MMS config.");
                 MmsConfig.loadAsync();
             }
-        }, new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED),
-        Context.RECEIVER_EXPORTED/*UNAUDITED*/);
+        }, new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
     }
 
     private static void initMmsLib(final Context context, final BugleGservices bugleGservices,