Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b

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

Change-Id: I101d53831bdf6bf4f083e5ff17baad4c014c5eee