Merge "Fix taskbar drag view scale when returning to original icon" into...

Merge "Fix taskbar drag view scale when returning to original icon" into tm-qpr-dev am: 3d1bb164 am: c8207a7e

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



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