Merge "Resume A2DP when VR app stops VR without SCO" into q-keystone-qcom-dev