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 am: c277359a

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



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