[automerger skipped] Merge "Block clipboard UI when device is locked" into...

[automerger skipped] Merge "Block clipboard UI when device is locked" into tm-dev am: 12692eca am: 4a1101b6 -s ours am: 15cfe031 -s ours am: 410da0db -s ours

am skip reason: Merged-In I1a48cbe64852dce3fba69915ca11dad8878f66eb with SHA-1 01a84282 is already in history

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



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