Merge "Merge "Set shortcut info even if metadata doesn't have shortcut id" into rvc-dev am: a5ac201a am: 4b435d71" into rvc-d1-dev-plus-aosp am: ed50936b

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

Change-Id: Ib53018bb993144a55f3b32b25f15ea4d943ef951