Merge "Set shortcut info even if metadata doesn't have shortcut id" into rvc-dev am: a5ac201acd

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

Change-Id: I3fd9b90e2dceb715214514ddf2c5fbfd9b7bc694