Merge "Apply the new A2DP codec config only when passed the check with codec status" am: fe448844c5
am: fe8185064f

Change-Id: Ic8f45156a7021e9b0f17252c9e76c8eca1d11c0e