Move Multi Sim settings above other settings

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