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

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

Change-Id: I45caaafe38fcb82c4ca4a924ad6b374fe6493d0e