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

[automerger skipped] Merge "fix(magnifier): avoid crash when smashing magnifier shortcut button repeatedly" into udc-qpr-dev am: 2d606637 am: 94ef1785 -s ours

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

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



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