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

Change-Id: I1ad0e6187f2b3de1f32b0391ce97447a831874b3