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

am skip reason: Merged-In Ifc3f0526d470cc7bdfda8c610fc19bfdca73fe92 with SHA-1 fab191b3d7 is already in history

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

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