Merge "Notify ImsService Status Correctly" am: 1bb9181380
am: 6d249dc08c

Change-Id: I5cd0317376fcf915c777ed56da9e856d72272b41