Merge "Merge "Add ims registration status" am: d217a0c5a7  -s ours am: d850ce22f2  -s ours am: f27ccdbafa  -s ours" into oc-mr1-dev-plus-aosp
am: a2ff4ce0a0  -s ours

Change-Id: Iec956b4076993cf6f1ebdc9e175fb6c5e3d39eba