Merge "Fix magnification border includes taskbar" into sc-v2-dev am: f9e1f3b1a1

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

Change-Id: I33af7bc1a1339cdc468c2924c08a6d399a0ab664