Merge "Add ims registration status" into stage-aosp-master am: bd1f2b56bb am: 569ccc26c8  -s ours
am: 7d7a6be1aa  -s ours

Change-Id: I11aeaa63c3da7f071bec0e2882e83885e5bef6ca