Merge "Reset cell broadcast config before enabling all channels" into rvc-dev...

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

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

Change-Id: I895581d793e6e813b072a9c0dadb427a520886a8