Merge "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev