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

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

Change-Id: I17ca114fbf3a851b947cf79722b0e42bf0e4e6e3