[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
am: e8b70d7422  -s ours

Change-Id: I16c7823773e1a1ca070bfc5189be080996f0d38e