[automerger skipped] Revert "DO NOT MERGE Fix the cutout of magnification border" am: c91a43e110 am: 2705be5666 -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: Ifc72f7ef7e566285ccc332a63a2d5697ef5591f9