[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 92739dfb3b -s ours am: b51735c732 -s ours

am skip reason: Merged-In I8dd82ff477afc4ae3899ac7edca28d46324a661f with SHA-1 6c4aa69649 is already in history

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

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