Merge "Small changes to ImsTestApp when testing ImsService changes" am: 338b2cbe56
am: bc3e2cd0dd

Change-Id: I1d3519c86580f67b251dad2e21de452fede37dac