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

Change-Id: If72eec3f724ec7bb7a392d579da163009b72e2b7