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

Change-Id: I8c0ed9484ddab419866680e64779b9316dce4595