[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 1705cbfaae -s ours

am skip reason: Merged-In I1a6a89435ccd37ae12931bb9870dc24590c44887 with SHA-1 9328de7818 is already in history

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

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