[automerger skipped] Merge "Faster Emergency Dialer new UI design" into pi-dev
am: 55c8278749  -s ours

Change-Id: I82d06c6426b5c21467286d4a519b17890e512994