Merge "Merge "Add ims registration status" into stage-aosp-master am: af845720f6 am: 99768cc46c  -s ours" into oc-mr1-dev-plus-aosp
am: b7773add7d  -s ours

Change-Id: If245269478b0f7ae17334bd7e702a5477ac1cb15