Merge "Add drag icon to folder use case back" into tm-dev am: 517f26ae am: 00d19519

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



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