Merge "HFP: Allow SCO audio to be forcibly connected"
am: 24593a9fc6

Change-Id: I32d9d8fd9ef6da04fec49903411437f1003c742d