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

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

Change-Id: Ic1ce3fbd0e68848a7095f3408d877117b0678adb