Merge "Fix the cutout of magnification border" into sc-v2-dev am: b6e3caeb7a

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

Change-Id: Ie8b622bd531ca8600a7737b0ff5ea4c024db0be9