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

Change-Id: I4714178cf4bec5707a4cc0a17b1974de7859d015