Merge "Fix the duplicated info of SIM cards after Hot-plug." am: cd44f8d4fe am: bc5aa81a64
am: c59b54a4e4

Change-Id: I5d3886c07cfc679ed471d8fe990b49e90d65a76b