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

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

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