Merge "Test ImsService updates for dynamic ImsService"
am: 39dc3d47f6

Change-Id: Iddd521929ecab39a268d3b410f4f120d86bcf39a