Merge "Icon should not disappear on drag and drop" into tm-qpr-dev am: 7eae6a4c

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



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