[automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e18 -s ours

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

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

Change-Id: I5f4399b3efd42de2f15c869e9dfa5fa7baf6dd4e