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

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

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

Change-Id: I73778aa7a6decbf4a374d3da7b38229e3517e85f