[automerger skipped] Merge "Apply the new A2DP codec config only when passed...
[automerger skipped] Merge "Apply the new A2DP codec config only when passed the check with codec status" into qt-qpr1-dev
am: f01e15d5 -s ours
am skip reason: change_id I028b9f168d2e629dd02c8474592e3713445a5000 with SHA1 cc7ae803 is in history
Change-Id: I767ed19304d7d6e0591b6512dcc975da52e9e84d