Merge "Remove ImsService Feature Interfaces" am: abfdf0e03d am: 61fb76d9a0
am: 36521b89fe

Change-Id: Ib0bc09870473c437639a4026835a0bc26e6c6b0d