[automerger skipped] Merge 24Q3 to AOSP main am: 4022bde4e2 -s ours am: f517e84005 -s ours

am skip reason: Merged-In I2e802819614b547e8bf096a446ed48118a795e27 with SHA-1 9108551fd8 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/weaver/+/3258554

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