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 am: bb540b05 am: f79bc11a -s ours" into rvc-qpr-dev-plus-aosp am: 1779fe2b -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: I08464620b59647ae585f3b3a975740e4aa6c21a3