[automerger skipped] Merge "Merge "fix(#Magnification): presubmit error on...

[automerger skipped] Merge "Merge "fix(#Magnification): presubmit error on WindowMagnificationManagerTest" into udc-dev am: c0f8d1ba am: 390d48a6" into udc-d1-dev-plus-aosp am: d442f971 am: ce3c0eab -s ours

am skip reason: Merged-In I0cf901b40deaa8a32c28ec98e13a7f7cf7d80fca with SHA-1 77723527 is already in history

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



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