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

Merge "Merge "Remove spans from edited text when copying back to clipboard" into tm-dev am: fc51b366 am: 251463ca" into tm-d1-dev-plus-aosp am: c3274842

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



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