Merge "Add a new carrier config to support emergency dialer shortcut feature." am: c85fa5471d
am: 79c683e659

Change-Id: I05e0367341221111c22fb583625412f1bffeb9aa