Merge "Ignore repeated dismissals for clipboard" into tm-dev am: 3ffed0bc am: bc0edaae

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



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