Merge "Fixes for VR + A2DP concurrency with new VR changes" into p-keystone-qcom