Merge "Shortcut crash fix" into udc-qpr-dev am: 9bbb0c75 am: 3918b8c7

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



Change-Id: I8bc10c33406f552ec920234d94849a581abaa23a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>