[automerger skipped] Merge "Add transition on keyguard showing" into 24D1-dev...

[automerger skipped] Merge "Add transition on keyguard showing" into 24D1-dev am: cc4ab8ae -s ours

am skip reason: Merged-In I80313281219fd6b42fe3dffffde2ef90086b0e59 with SHA-1 f5ec5ef1 is already in history

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



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