Merge "Remove spans from edited text when copying back to clipboard" into...

Merge "Remove spans from edited text when copying back to clipboard" into tm-dev am: fc51b366 am: 251463ca am: b103a155 am: 2fe7f4b1

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



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