Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3 am: fce339c49c" into oc-dr1-dev-plus-aosp
am: 385f581ffd

Change-Id: I745d3213d8db86dad2a9779f5c51b6c1ed463719