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: I9aef596a270f202a6be12363c4e8a6d547d3d284