[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: 2585fa94fa -s ours

am skip reason: Merged-In Ica9a995eec0aff0924e174ab39ee468c32b6d5d0 with SHA-1 d4363b8611 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/3413879

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