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

Change-Id: I6dd2f056b4d552b427873da49a6ecd3394d77cb4