Merge "Update edit state drop target and hotsteat margins." into tm-dev am: 5ee9d60f

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



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