[automerger skipped] Refine Emergency shortcut button UI am: fa6b666b4d  -s ours
am: 9ff6544788  -s ours

Change-Id: Idac5a2e124f69fec8d94bd03ca36291808c8a7a9