Merge "HFP: fix leakage in HeadsetPhoneState"