[automerger skipped] Merge "Fixed that emergency alert dialog not popped up" am: 4da7f91b23
am: 480903bbcb -s ours
am skip reason: change_id Ie563a8f11ac991ab9568f65df6a4d14eebe47c5e with SHA1 974607aac8 is in history

Change-Id: I606baf2e1cdb05e5e286285bc268cb61441e59e0