Merge "Dismiss magnifier correctly in concurrent editing scenario" into sc-dev...

Merge "Dismiss magnifier correctly in concurrent editing scenario" into sc-dev am: 7b0989f3 am: a5a24d8a

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

Change-Id: I7c8d4e5d5034b35dd9b5e6a37fa6e68100fbc9da