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

Change-Id: I247ee87f974de90348f5583a9f8c217824108c0a