[automerger skipped] Revert "Do NOT MERGE Fix magnification border includes taskbar" am: 8f2824fc72 am: 4cb684a8ee -s ours

am skip reason: subject contains skip directive

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

Change-Id: If21fc144726c2a774834ba428fdc7911cbc4aab7