tree b8431299c116560f7b4bbf1570a028ac4cce31c8
parent 621c68f4f2e017279ea75b47fb97c627ab8780da
parent aeed8c9e9e527f89ba33495e0390b16dd5820838
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593477484 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593477484 +0000

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