Merge "Add support for Opus over A2DP" into tm-qpr-dev am: 165f7609 am: b702d4f6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17901607



Change-Id: I9999a4578d95b16bd05133175723a57a35474581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>