[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package...

[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a am: edaa3d3c -s ours

am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11348546

Change-Id: I68fc2c764a1f58c444985bbc64fc2641c011c9a8