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

Change-Id: I8cad0b24055c0c6fc8b57b7bb0d2cbf9fa3cfbd3