Merge "fixing rare NPE" into tm-qpr-dev am: 1e42ff6353 am: 5864113904

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

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