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

Change-Id: I788d9d81ffad8dc024908f3cd967b19c75992c70