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

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

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