Merge "Changed the text in emergency alert history"
am: 30d478cde5

Change-Id: Ife5825fad251fb5415fa4615b5263787daee451d