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

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

Change-Id: I7cd7f926f66d8e37b3981dcbb3a7bfe6f07cf3f7