Merge "Fix incorrect logic in registerImsProvisioningChangedCallback"