[automerger skipped] Merge 24Q3 to AOSP main am: f2b64b41 -s ours am: ea256db0 -s ours

am skip reason: Merged-In Ib57f06cdb4fdf567a4c4e4ca17d4df7b1745cec7 with SHA-1 c599d24d is already in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3254330



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