Merge "Fix an issue where the return value is null when retrieving shortcut"...

Merge "Fix an issue where the return value is null when retrieving shortcut" into sc-dev am: f049770c

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

Change-Id: I21a3606f0b7ca5063abe97f78481a9d152482ee9