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

Change-Id: Id187f844dd22b47db7cbc0f62ba07e3b78100986