[automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-d1-dev-plus-aosp am: 2e91dd70 am: 415510c8 -s ours

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

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

Change-Id: Ife32055fef2e11026cb237aa4ac816d09eeb52c4