Fixed emergency alerts for carriers

Bug: 110233310
Test: Manual
Merged-In: Id2a21c55e5fa16e85f98f5fcc5e9712d5a945c69
Change-Id: Id2a21c55e5fa16e85f98f5fcc5e9712d5a945c69
(cherry picked from commit 1394c1cea9979bff74c93a82ae0f11c456f03c67)
3 files changed