Merge "Exposes getImsServiceControllerAndListen interface"
am: 740162d7f7

Change-Id: I6fae69df4bd94fc120015066c3ba2c7ab85c447a