Merge "Add Emergency Call testing mode"
am: cc07875537

Change-Id: I94d047934486e79e03a8cd8dd0c499229a602a43