Merge "Exposes getImsServiceControllerAndListen interface" am: 740162d7f7
am: 626c33da97

Change-Id: Ifdf5c3740206df2d89aa0b07b17439d71ae70540