Merge "Revert "Fix the duplicated info of SIM cards after Hot-plug." This reverts commit caca9048f86c5d954277f5bedd781fae604ae4e0." am: eab5a73279
am: efdb79e419

Change-Id: I0a9a071ab072eba6d5a2c469855235583a155160