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

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

Change-Id: Ibe4d9a0be58d425d58b63b7a4b7df82a32190ab5