Call equals() comparing different types

See: http://review.cyanogenmod.org/#/c/28642/
https://android-review.googlesource.com/#/c/45430/

Change-Id: I1ef553e5d64cb36e96fdb28e7f437efb9edd5c6d
Move Multi Sim settings above other settings

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