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

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



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