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-plus-aosp am: d8b6dc30 -s ours" into rvc-d1-dev-plus-aosp