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

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

Change-Id: I6ace2cc3e58521220c3058abe473f7f48f2243ec