[automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev am: 6f000e189b am: 29eae58c31 -s ours am: 2488afb327 -s ours
am skip reason: Change-Id Id571b990f4e45aea5bbab0dbadce48dda7b2bc56 with SHA-1 e9c44278c5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11896412
Change-Id: I2ca0b2699e2780cf29dfeaf64aa1b17cfd6f06cc
This commit is contained in: