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

Change-Id: I392de9b636eaffcbd4bfd87c1e3435ecb9aa7422