[automerger skipped] Merge "Fix magnification border includes taskbar" into...

[automerger skipped] Merge "Fix magnification border includes taskbar" into sc-v2-dev am: f9e1f3b1 am: 8ca0abc4 -s ours

am skip reason: Merged-In I882bf48585f646cee5827044c88da37250041c0f with SHA-1 dc9b90f4 is already in history

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

Change-Id: I749e64b2208d762227b8dbdb488e2a052c1100b6