Merge "Don't display extra A2DP profile icon for OPP." into honeycomb