Merge "Re-register for IccStatus changes on SIM_STATE_CHANGED." am: 9c8d8ff81c am: 2febdf9716
am: 677bacca3c

Change-Id: I87459f711a196f8f7a0d9f2f64ddaaf2a590e282