Merge "Support exiting edit mode when performing click action on the...

Merge "Support exiting edit mode when performing click action on the magnifier" into udc-qpr-dev am: dc371e00

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



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