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

Change-Id: I6a681163131270fe4eea8fbc8c6d077a5bd62a9f