DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism for...

DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism for 2Mbps-only links for audio""

This reverts commit 8af80fe8.

The original issue in oc-mr1-dev has been resolved by:
https://googleplex-android-review.git.corp.google.com/#/c/2576565/

Change-Id: I8bac8dca7939bac1865fe820e3c7b8252ce99478
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159