Merge "Added skip button for emergency call test" into pi-dev
am: de2466c0af

Change-Id: Ie26f1bdd8fe25fa70107feb4176c4ba66237b796