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

Change-Id: I88dc89c607a64c82073e176066e882d2b4d2ace6