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

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



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