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

Change-Id: I94c49c7f3358ce52a3d9e7c134edec09104889fd