Move Multi Sim settings above other settings

Change-Id: Id7ce844529299fa1e42bde5d433bc0ecd1c68527

Conflicts:
	res/xml/settings_headers.xml
Call equals() comparing different types

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

Change-Id: I1ef553e5d64cb36e96fdb28e7f437efb9edd5c6d
Merge branch 'kitkat' of github.com:AOSPA-legacy/android_packages_apps_Settings into kk4.4