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 am: 4ac80cfc -s ours

am skip reason: Change-Id Id571b990f4e45aea5bbab0dbadce48dda7b2bc56 with SHA-1 78b41002 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11935092

Change-Id: I28c34ecc64aaa42090bbf84e36df0b298abff709