Merge "Test ImsService updates for dynamic ImsService" into pi-dev
am: 6634d013aa  -s ours

Change-Id: I276b7ea52b9c691ef3de093bb2ecf0f579a5f32e