[automerger skipped] Merge "Fix crash on long press of prediction row icons"...

[automerger skipped] Merge "Fix crash on long press of prediction row icons" into tm-qpr-dev am: 2bcc3f85 am: 7ed3c826 -s ours

am skip reason: Merged-In I9a4679ba82cacb5e2648481274876dbfc95d80ce with SHA-1 c4430c9c is already in history

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



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