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

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

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

Change-Id: Ia1a1d7e7c61fda56c6e88e2b7afded191b0e7f72