Merge "Remove obsolete edit chip in clipboard UI" into tm-qpr-dev am: 60694e36 am: 60a730a2

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



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