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

Change-Id: I6dfdb7968dc34676ef10813a9b74b365bf06a445