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

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

Change-Id: I7aeb000b0de8b704ad34201e8b9792a75e082d16