Merge "Remove old compatibility layer for old ImsService Impls" am: b0a795a511 am: 7c9af8e7e8
am: 3431242cef

Change-Id: Ia4eeb53c443584fdfa5f14d2f10b5f199fd19dc3