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 am: 414e8544

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



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