[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: d02f9a6e -s ours am: 2804c766 -s ours

am skip reason: Merged-In I24f0eafb2479ac7427ba28077e45ba26a9127cc8 with SHA-1 6bf1032b is already in history

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



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