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