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

[automerger skipped] Merge "DO NOT MERGE Fix the cutout of magnification border" into sc-v2-dev am: 0ee6940b am: 6f505d67 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ieb9ab627dac270b4f5cee3666efa7d9b028de368