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

Change-Id: I7b7996e82229c22deb473bc1857dc43cbfbf93fc