Merge "move the responsibility of calling updateImsServiceConfig back to the ImsPhoneCallTracker"