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