Merge "Notify the dialed Emergency Number" am: c62fd60b4b am: 87b9f47733
am: fa60c79907

Change-Id: I62ee69d6904145311879734253408664acadd60e