Look for the msim settings in the new location deviceinfo/msim

Change-Id: I4e81b9c895b11e0a851ad81601271888dfd4f855
Merge remote-tracking branch 'upstream/kk' into kk