Merge "HFP: Allow SCO audio to be forcibly connected" am: 24593a9fc6 am: fc7e56a925 am: c956b195e7
am: 1fa21505ce

Change-Id: I40facf66260f9819efcd9d388e639b4fb387c94a