[automerger skipped] Merge 24Q3 to AOSP main am: c757329e9b -s ours am: 4d2beaf64f -s ours am skip reason: Merged-In I6c92491c177c141a91d84909ef046d20ded9d75f with SHA-1 a2c7b6a657 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/DeviceLock/+/3258439 Change-Id: I646dd6e8ab058a54449b30a6280a8f9d4063e921 Signed-off-by: Automerger Merge Worker <[email protected]>