Merge "Merge "Fixes NPE with system shortcuts." into rvc-dev am: 6f5d4bb8ab am: fc49c2c54a" into rvc-d1-dev-plus-aosp am: 7264ed06b4 am: aeed8c9e9e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12035575

Change-Id: I378154b1d972b203768fcec998d30bab33c48639