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

[automerger skipped] Reset cell broadcast config before enabling all channels am: dd375676 am: addb45f7 -s ours

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

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

Change-Id: Ib03ea85249d9b99fa412d7f65fa3535946c60a11