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

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



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