Merge changes from topics "msim_tests_fixes", "redial_emer_phone_account" am: 8823dd0a36 am: 552799c7f9 am: 258efa1829
am: ccc6ef71f3

Change-Id: If6213952d4dda48277c65f647680ba304871bc20