Merge "Merge "Set shortcut info even if metadata doesn't have shortcut id"...

Merge "Merge "Set shortcut info even if metadata doesn't have shortcut id" into rvc-dev am: a5ac201a am: 87ee1802 am: 23c2510f" into rvc-qpr-dev-plus-aosp am: aec62ad8

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

Change-Id: I29e8068a2683449b2ad168c99169ef7f52e8c124