Merge "Add ims registration status" into oc-mr1-dev-plus-aosp
am: 6f48d5e767  -s ours

Change-Id: I625d9a95d02865a6a97685421a00cee145b99de7