Merge "Fix emergency call is failed without SIM under APM" am: e00e526a5c am: 2b0f8e2424
am: 7439a4fe38

Change-Id: Iaf18f331d118de1b525a336dd1f3a5fa2e9e06fb