[automerger skipped] Merge "Revert "DO NOT MERGE Fix the cutout of...

[automerger skipped] Merge "Revert "DO NOT MERGE Fix the cutout of magnification border"" into sc-v2-dev am: d9db871f am: daae3f11 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I391c0d48eff29cca22e0ee5edea4961125ef35f1