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

Change-Id: I5f398533c35c38cfbc27a24799cb795930cc26b5