[automerger skipped] Emergency info button design change
am: a7f55ffa33  -s ours

Change-Id: I97452eb393e8d98bec284275681f0b43934c81c2