Merge "fix(magnifier): avoid crash when smashing magnifier shortcut button repeatedly" into udc-dev am: 566c5e8399

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

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