[automerger skipped] Merge 24Q4 into AOSP main am: 359709f82b -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: Id151c4d2bc38ffbde7dbb14cc767b151cf199b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>