[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: 6c0ca0dd -s ours am: e55f7b9c -s ours am: 92b57fee -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: I464d1978f72d720f61862e01a5e4753cabf36f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>