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

Change-Id: Iffd640d2b4a74ee6437fff179349f71656034957