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

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



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