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

[automerger skipped] Merge "Do NOT MERGE Fix magnification border includes taskbar" into sc-v2-dev am: eb8b4fde am: c0cb2064 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3d02209f4178153d3a4a6211c7410d74822bdf14