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

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



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