Merge "A2dpService: unused code cleanup" into q-keystone-qcom-dev