[automerger skipped] Do NOT MERGE Fix magnification border includes taskbar am: fa486cd2 am: d728d065 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8831c110b01c162630a05f6b0d286b0e69d15cf6