Merge "Possible fix for NullPointerException b/206040100." into sc-v2-dev am: b78cbf29e5 am: 7684d31b8e

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

Change-Id: I0f0f5a6fbcb1731c1d2eb1f3d7aef8317bac1430