Merge "fix(#Magnification): presubmit error on WindowMagnificationManagerTest" into udc-dev am: c0f8d1baad am: 390d48a668

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

Change-Id: Ia9d5f5bca2c52b8fb54e5fe21dca83cceebaf109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>