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

Merge "[automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: e51ecf74 -s ours am: d0c7c85c -s ours am: 57735685 -s ours" into rvc-qpr-dev-plus-aosp am: 6a7739f4 -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: I8e9c9e8f4371ef057224a087d120cbf18cc4b748