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: 9ab8060a am: ec763653 am: 961437b5

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



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