[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: e9bfcc0808 -s ours

am skip reason: Merged-In Ief2fe8856f452edf0315ecdd831b14685b3f5af5 with SHA-1 587c48d59d is already in history

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

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