Merge "fix(magnifier): avoid crash when smashing magnifier shortcut button repeatedly" into udc-qpr-dev am: 2d606637

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



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