Merge "Fix A2dpProfileTest#getLabelDeviceConnectedWithHighQualityCodec" into oc-mr1-dev
am: ae1dd84bf0

Change-Id: Ifa7eea6473cc68ee71b8a6b7d3884012868407d0