Automatic translation import

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

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