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

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

Change-Id: I755c4e3ef282e5ac354afa9f55e61223f30b6123