MSIM(DSDA): Leave subscription alone on non-MSIM devices

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