Merge "Fixed that emergency alert dialog not popped up"
am: 4da7f91b23

Change-Id: Iba1c3d277171a1727953509438d3cabacb9c45cb