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

Change-Id: I5212ed57f559cb2cc4a927d2a6452f42878c2819