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

Change-Id: I08d792ce52542f976af0113adce4c0417380bf06