Merge "Make sure metadata shortcut ID is always set on Bubble." into rvc-dev am: b564d829b5 am: 8297570bfa

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

Change-Id: I865df12eb4896618b24697edc7398b3397f0aabd

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

@@ -137,6 +137,7 @@ class Bubble implements BubbleViewProvider {
             final int desiredHeight, final int desiredHeightResId, @Nullable final String title) {
         Objects.requireNonNull(key);
         Objects.requireNonNull(shortcutInfo);
+        mMetadataShortcutId = shortcutInfo.getId();
         mShortcutInfo = shortcutInfo;
         mKey = key;
         mFlags = 0;