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

Change-Id: I5692e321137265cc63e5a0572ca5124e418e653f