Merge "hal: Modify A2DP output routing post releaseAudioPatch"