[automerger skipped] Merge 24Q3 to AOSP main am: 41e2472a82 -s ours am: cab7a88e33 -s ours

am skip reason: Merged-In Id55979b34f94b9d6819a9e3054aa3a37ac8b44e4 with SHA-1 37e94ff4ff is already in history

Original change: https://android-review.googlesource.com/c/platform/external/walt/+/3258574

Change-Id: Ie91946acef358ff952acae62e2b46cfe0e1d74c7
Signed-off-by: Automerger Merge Worker <[email protected]>