Merge "Merge "fix(#Magnification): presubmit error on...

Merge "Merge "fix(#Magnification): presubmit error on WindowMagnificationManagerTest" into udc-dev am: c0f8d1ba am: 390d48a6" into udc-d1-dev-plus-aosp am: d442f971

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



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