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

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

Change-Id: I8f3a10f253f54513656a9cf30eee7535b8ef3289