[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2471b1a481 -s ours am: 6db989c8e8 -s ours

am skip reason: Merged-In Ie3e8fdc324a8350e79cf4272130d4f2ae3c06ce9 with SHA-1 c29b8e8c8c is already in history

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

Change-Id: Ic8d4717b8961327acc3b21decfb5012beaa79bfb