tree d5f7b052a995871070c339b57127a02359e8576f
parent adf1fe59b939fdd20bde449988697560e7d84f83
parent ed5ea6df5fb4d4c0076ab2b3927e013e27b2e796
author Thiru Ramasamy <thiruram@google.com> 1593476345 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593476345 +0000

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