Merge "Add Emergency Call testing mode" am: cc07875537
am: f76ddd32bb

Change-Id: I4964ef417f72e03b3be601b072adb2f491b3423f