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

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

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