Merge "Migrate Cellbroadcast modules to use modules-utils" into stage-aosp-master am: 921efdf1bd

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

Change-Id: Iaba3112fc75b57392638e1f57414b3696cf8e3c3