Merge changes from topics "msim_tests_fixes", "redial_emer_phone_account"
am: 8823dd0a36

Change-Id: I42951ff00a5c58697714b26414669f6882a74940