Merge "Take margin insets into account when setting position" into sc-dev am: 0f3053ceae am: 7f5fa6d1e6 am: 3da704144f

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

Change-Id: I10df9eefb92f8a71b8954649c608b828ae9a9aa8