[automerger skipped] Merge "fix(magnifier): avoid crash when smashing...

[automerger skipped] Merge "fix(magnifier): avoid crash when smashing magnifier shortcut button repeatedly" into udc-dev am: 566c5e83 am: d695bdb1 -s ours

am skip reason: Merged-In I24f0eafb2479ac7427ba28077e45ba26a9127cc8 with SHA-1 35a86388 is already in history

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



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