Merge "Take margin insets into account when setting position" into sc-dev am: 0f3053ceae am: e8ea68582f

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

Change-Id: I86391bfa2d276c15b72ea6511b2d5b536467309d