[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 1041ab18c2 -s ours am skip reason: Merged-In If35daf24e929e5e06f252a4fa2b8475e2bf10547 with SHA-1 c332ac15d2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/DeviceLock/+/30284522 Change-Id: Ia0998147b40cfd4e288d6520c3391cc9e1dae1d7 Signed-off-by: Automerger Merge Worker <[email protected]>