[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8d21ce2eb8 -s ours

am skip reason: Merged-In I94e6e6b9f5c65db300c3548681303c8496b489be with SHA-1 7a8bdea7f0 is already in history

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

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