Merge "Migrate Cellbroadcast modules to use modules-utils" into...

Merge "Migrate Cellbroadcast modules to use modules-utils" into stage-aosp-master am: 921efdf1 am: 2798f847 am: c581c335 am: db80b4ad

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

Change-Id: I44fd58a5fbc2f313aa9d38a2ff7d6a01d0f6cf91