Merge "Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19 am: f4734b2025 am: 61d539cbd8" into rvc-qpr-dev-plus-aosp am: f2b7d031e9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113

Change-Id: Ic4189e499f12657a2b2b36be85b7ced03a0b2551

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

@@ -163,6 +163,11 @@ public class BubbleExpandedView extends LinearLayout {
                             Log.d(TAG, "onActivityViewReady: calling startActivity, "
                                     + "bubble=" + getBubbleKey());
                         }
+                        if (mActivityView == null) {
+                            mBubbleController.removeBubble(getBubbleKey(),
+                                    BubbleController.DISMISS_INVALID_INTENT);
+                            return;
+                        }
                         try {
                             if (!mIsOverflow && mBubble.usingShortcutInfo()) {
                                 options.setApplyActivityFlagsForBubbles(true);