Merge "Set shortcut info even if metadata doesn't have shortcut id" into...

Merge "Set shortcut info even if metadata doesn't have shortcut id" into rvc-dev am: a5ac201a am: 87ee1802 am: 2e6898f3 am: 50ef84ae

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

Change-Id: I1c21002ea966ea092e783c1ec36f88a03ca4bd6b