[automerger skipped] Fixed 2nd emergency alert not shown issue am: db02669239 am: 089450b1fe am: 0d4c728805 -s ours
am skip reason: Change-Id I4c6cdd6239d04cee57e68afaf341445adca4b027 with SHA-1 faef7b04a2 is in history

Change-Id: Idb4cefe7dad355106e7328d98cf1cbe47526a167