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: 23c2510f

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

Change-Id: I9d47c68c7003692bd14b08c57367a05f79ef1dba