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

[automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: e51ecf74 am: bb540b05 -s ours am: b5847944 -s ours

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

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

Change-Id: I6596d5e0763cc502b9e99c5be1ed1a06845c81ba