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 am: 6f000e18 am: 29eae58c am: 08214e12 -s ours" into rvc-qpr-dev-plus-aosp am: 65edfa84 -s ours

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

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

Change-Id: I0751f7a3076b82fe80bfc907bd0b9e3a3adb5f70