tree b8431299c116560f7b4bbf1570a028ac4cce31c8
parent 66c09a0c96dbc3648da06e26632c637826494406
parent adf1fe59b939fdd20bde449988697560e7d84f83
author Thiru Ramasamy <thiruram@google.com> 1593477423 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593477423 +0000

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