Merge "Adjust edit state drop targets and workspace scaling per device type and orientation." into tm-dev am: 690661159e am: d91460dd32

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

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