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

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

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



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