Merge "Hide edit buttons on clipboard and clipboard smart actions" into tm-dev...

Merge "Hide edit buttons on clipboard and clipboard smart actions" into tm-dev am: be2681d3 am: 6c3e0cf8

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



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