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

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

Change-Id: I7d18877847b41ab78d763af59328b8a41c27d62c