Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev am: f6840a17ff
am: e7e1f44364

Change-Id: Ibe760e8622179c16b1311c05ccc659f194af789e