tree d5f7b052a995871070c339b57127a02359e8576f
parent 30988deadeb6f6d92222a74eb7372572b52c24b7
parent 7264ed06b40c52164d69a2c8bf6187935305194c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593476383 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593476383 +0000

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

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

Change-Id: Ic8ba30bdaa785ceac4c13ace9a4023e85f3c24bf