[automerger skipped] Merge "Mark 24Q4 as merged in aosp-main-future" into aosp-main-future am: b1bdcf12fc -s ours

am skip reason: Merged-In I25176c03a4a10ebf981d4bc8993a8ba261b236ac with SHA-1 47a071b07c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/update_engine/+/29935175

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