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: 06fb3575 am: 4d5d05e7 am: 6301b874

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



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