Merge "Remove ImsService Feature Interfaces"
am: abfdf0e03d

Change-Id: Ie142d4673c2a3930b3e7c3bcba617e5e26c8fb9c