Merge "fix(#Magnification): reset gesture handler state when magnifier...

Merge "fix(#Magnification): reset gesture handler state when magnifier deactivates" into udc-dev am: 3b65691e am: 66dae49b

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



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