Merge "DO NOT MERGE Fix the cutout of magnification border" into sc-v2-dev am: 0ee6940bd0

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

Change-Id: Ib04fe2c82d9ddd02dbd3025e1a7983d61fa264ce