Merge "Set shortcut info even if metadata doesn't have shortcut id" into rvc-dev am: a5ac201acd am: 87ee1802a7 am: 2e6898f394 am: 50ef84ae72

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

Change-Id: I1c21002ea966ea092e783c1ec36f88a03ca4bd6b