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: 4b435d71

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

Change-Id: I8677a62fccc92481ab8d4929af7bb616c9dc5197