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