[automerger skipped] Merge "Migrate Cellbroadcast modules to use modules-utils" am: b0578d5fa3 -s ours am: 5f4a5b87c8 -s ours
am skip reason: Merged-In Ia72c92d6be150edfee3743878d988f21a585e808 with SHA-1 1aff432fda is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1834517
Change-Id: Ic290c686541d662c8c7c528e5605489d351f9b99
This commit is contained in: