Merge "HFP: fix leakage in HeadsetPhoneState" am: f995d62ae7

Change-Id: If32f8d8d22474cbb98c782e98c3fbac1323aec39