tree dbee58f6eee6bb24de5afe2301be264de7db69bc
parent f3c24e4a9fc366014510990df06e50dcac363791
parent 8d88a9538706f90324dc243ff9a5d51ea3592ccc
author Miranda Kephart <mkephart@google.com> 1728057261 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1728057261 +0000

[automerger skipped] Merge "Block clipboard UI when device is locked" into tm-qpr-dev am: 78033ff1bd -s ours am: b2af65e35e -s ours am: 5b0c57f5d5 -s ours am: 8d88a95387 -s ours

am skip reason: Merged-In I1a48cbe64852dce3fba69915ca11dad8878f66eb with SHA-1 b156c58234 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>