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

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



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