Merge "HFP connect Audio"
am: 1a7c04346a

Change-Id: I04f140e4396a418cc61b6c1b0a1e73cc607e793f