[automerger skipped] Merge "Fix the cutout of magnification border" into sc-v2-dev am: b6e3caeb am: 29cb9757 -s ours

am skip reason: Merged-In Ifef81640fe6c08ee1b0dcd3915227fba3002ea43 with SHA-1 c8d588cf is already in history

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

Change-Id: I9d79ca27fa4e8e95932c6f560f401e0a24eb0379