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

Change-Id: Ib8602579b1028fd086c4fc0a13897a671bb6b73e