Merge "HFPClient unhold conference call"
am: 24c71a61be

Change-Id: I410254eeb071eba49c389ddedd6c03b71450f453