Merge "Remove text spans from clipboard EditTextActivity display" into udc-dev am: a6db0df5 am: 3cbfe4e8

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



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