Merge "Reset SIM state if the subscription is no longer active." into pi-dev
am: 4f3d29de54

Change-Id: I69bdf0d2fd6fcfea2a2ae5b5d9056407e0a498e4