[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 1e726f6974 -s ours

am skip reason: Merged-In I254866bec5845b396ecbf81330b6cff02fdc4628 with SHA-1 c18cf78bd8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/30283802

Change-Id: Ia496da0cbf072068c75f1783195cf062829c03da
Signed-off-by: Automerger Merge Worker <[email protected]>