Bug 981711 - [Messages] Bug 947180 broke the SIM switch r=schung

This patch restores the SIM switching functionality using the iccId property.