Snap for 6343882 from 388a6a332fb9f6d7794d7a9bed8eea803a05a13a to rvc-release

Change-Id: Id36d19ed2f3b7273bdbfc248c3e08a80d786b08e
diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index d578df4..120bb1c 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -307,7 +307,7 @@
         Intent intent = new Intent(Sms.Intents.ACTION_SMS_MMS_DB_LOST);
         intent.putExtra(Sms.Intents.EXTRA_IS_CORRUPTED, isCorrupted);
         intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
-        context.sendBroadcast(intent, android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
+        context.sendBroadcast(intent);
     }
     /**
      * Returns a singleton helper for the combined MMS and SMS database in device encrypted storage.
@@ -533,7 +533,6 @@
                 // disappeared mysteriously?
                 localLogWtf("onCreate: was already called once earlier");
                 intent.putExtra(Intents.EXTRA_IS_INITIAL_CREATE, false);
-                sendDbLostIntent(mContext, false);
             } else {
                 setInitialCreateDone();
                 intent.putExtra(Intents.EXTRA_IS_INITIAL_CREATE, true);