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

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

Change-Id: I4a070ef7f9c53faebba42cd1e2744f8479ebe9aa