[automerger skipped] Merge "Reset cell broadcast config before enabling all...

[automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev-plus-aosp am: 156f8df4 -s ours

am skip reason: Change-Id I8d84bff9110a62b4464067b85099ee78aec6c9fe with SHA-1 dd375676 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/11935108

Change-Id: I57605b18f42347adf061d2eb0c628062b5659f87