Move Multi Sim settings above other settings

Change-Id: Id7ce844529299fa1e42bde5d433bc0ecd1c68527
Merge "Call equals() comparing different types" into cm-11.0