Merge "Revert "DO NOT MERGE Fix the cutout of magnification border"" into sc-v2-dev am: d9db871f79

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

Change-Id: Ib3cba27e15ae349cad41d34833b800b3541a0600