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

[automerger skipped] Merge "fix(#Magnification): presubmit error on WindowMagnificationManagerTest" am: fa1378eb am: c0213bc2 am: 49d80abf -s ours

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

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



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