This fix sim activations after wipe data (msim devices)

Change-Id: Ib25ca5c4f61a792f8016cfab998cdb95889e5a52
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0