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

Change-Id: Ibd80f0b55c452ef7de7b7c0a33f452ad902db204