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

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

Change-Id: I049046dc9586c6e6987ed284a59e73575536772c