Merge "Faster Emergency Dialer new UI design"
am: f8a53f8690

Change-Id: I3855f40e906ded2775f23a585d9e33469d0f513a