Merge "Fixes NPE with system shortcuts." into rvc-dev am: 6f5d4bb8ab am: fc49c2c54a

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

Change-Id: I0e66f32ad6cfd0004851ac9b7df48eb215c82fbe