Merge "Merge "HFP: Allow SCO audio to be forcibly connected" am: 93d7c84726 am: 10cb6f3b4c am: 0998ec224c" into oc-dev-plus-aosp