Merge "Fix bug where dragging icons in folders causes error" into tm-qpr-dev am: 7cb0133d84 am: e80898c6f1

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

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