[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" am: e8b70d7422 -s ours am: 7d906895e8 -s ours
am: 072a60c8c3 -s ours
Change-Id: I7c65b1db09429e68433fe3c781a2c04d884a53fc
This commit is contained in: