Merge "Fix the duplicated info of SIM cards after Hot-plug."
am: 0ef980abd2

Change-Id: Id52eec2688dd77797fffb603e451d8717b61a55d