[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 -s ours am: d0c7c85c -s ours

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

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

Change-Id: Ia916089c886d7b66a1f7be1298cc9b86a5bd5552