settings: Put MSIM files in the right place

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