Merge "Fix issue #6579824: Email crash observed after updating..." into jb-dev

Author: Dianne Hackborn

core/java/android/app/ActivityThread.java

@@ -4516,7 +4516,7 @@ private IActivityManager.ContentProviderHolder installProvider(Context context,
             boolean noisy, boolean noReleaseNeeded, boolean stable) {
         ContentProvider localProvider = null;
         IContentProvider provider;
-        if (holder == null) {
+        if (holder == null || holder.provider == null) {
             if (DEBUG_PROVIDER || noisy) {
                 Slog.d(TAG, "Loading provider " + info.authority + ": "
                         + info.name);