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

[automerger skipped] Merge "Block clipboard UI when device is locked" into tm-qpr-dev am: 78033ff1 -s ours am: b2af65e3 -s ours am: 5b0c57f5 -s ours am: 8d88a953 -s ours

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

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



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