[automerger skipped] Merge 24Q3 to AOSP main am: 381586f53e -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: I2bffc3327483439d370fcfab12498b15dc14a489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>