[automerger skipped] Merge "Migrate Cellbroadcast modules to use...

[automerger skipped] Merge "Migrate Cellbroadcast modules to use modules-utils" am: b0578d5f -s ours am: 5f4a5b87 -s ours am: 4045a652 -s ours am: 0b4da1e8 -s ours am: 5f71a42d -s ours

am skip reason: Merged-In Ia72c92d6be150edfee3743878d988f21a585e808 with SHA-1 1aff432f is already in history

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

Change-Id: I96578f03472aae489e3c53d510857bd2c42132fb