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

Change-Id: I89840b3426e4c45c3fe6a1be82e0c3e56ea09d0e