Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
am: fce339c49c

Change-Id: I1b2478820fbc282aa0448d1e1966f0cf81a2b207