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

Change-Id: I991bb0bd35356749639bb47030906feda9b472b7