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

[automerger skipped] Merge "fix(#Magnification): presubmit error on WindowMagnificationManagerTest" into udc-dev am: c0f8d1ba am: 15c22326 -s ours am: b4c90c79 -s ours am: 60259910 -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: I7a332627432759504959a68c414f32f72509005f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>