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

Change-Id: Ie3b16be029e59b25100653cb1f3acad6f85c7f50