Merge "Fix some jank issues with the clipboard" into tm-dev am: dc2426af am:...

Merge "Fix some jank issues with the clipboard" into tm-dev am: dc2426af am: a67ec614 am: 6f7c0e74 am: 16904474

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



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