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

Change-Id: I09eca1478a8b7c01c3eff5e3b1e758a8ec362249