[automerger skipped] Merge "Revert "Do NOT MERGE Fix magnification border...

[automerger skipped] Merge "Revert "Do NOT MERGE Fix magnification border includes taskbar"" into sc-v2-dev am: 292ed69c am: a49ed43f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16182772

Change-Id: Ib580f5380f99e4995c9b85c478d3894bfc045f08