[automerger skipped] Merge "Refactors...

[automerger skipped] Merge "Refactors FullScreenMagnificationController#onMagnificationChangedLocked" into tm-dev am: d62c6e6c am: 7bc658f6 -s ours

am skip reason: Merged-In Ib9f31681e442f1700a76250a5206199bad458c84 with SHA-1 c4f19733 is already in history

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

Change-Id: If8dab30e4f45fb4a578931a9bb7c51174a0f61a9