Merge "ADD NPE check before shortcut key creation." into ub-launcher3-rvc-dev am: 368621a4bb

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

Change-Id: Ib738b35576a98b2197c7861800167777a50a4435