Merge "Revert "msm: ipa3: Fix PM client state check during deactivation""