Merge "Exposes getImsServiceControllerAndListen interface"