[automerger skipped] Merge "Fix crash in Go Launcher" into sc-v2-dev am: eb2113af00 am: 797a282642 -s ours

am skip reason: Merged-In I37620be4f24a2f0f8f08483991fad7760415b67c with SHA-1 1beab2a3d7 is already in history

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

Change-Id: I98416c1abac0348516934f4dbed4ef4597b43446