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

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

Change-Id: I89329d5e664ef189eb9bf399430c7cfb50f8e114