Merge "Fix A2dpProfileTest#getLabelDeviceConnectedWithHighQualityCodec" into oc-mr1-dev am: ae1dd84b am: 691b715e Change-Id: Id187f844dd22b47db7cbc0f62ba07e3b78100986