Merge "HFPClient connectAudio"
am: be1feff522

Change-Id: Iaf5dcf01e037627d2f4b825478193fd3eaa573a7