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

Change-Id: Ieff2c212a4ee7fa51695cd89d1fb3ee2dbed6631