Merge "Revert "Do NOT MERGE Fix magnification border includes taskbar"" into sc-v2-dev am: 292ed69c65

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

Change-Id: Idd6ebe9ab3ebb2284a108e3c84cc734768c26850