Merge "Remove spans from edited text when copying back to clipboard" into tm-dev am: fc51b366

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



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