Merge "Align clipboard text editor with mocks" into tm-dev am: b07646b6 am: 878b3d22

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



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