Merge "BT: Aptx-Adaptive AIDL changes" am: 303c0f1eb9 am: ffd1bf2cc8

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1890097

Change-Id: I9dd683e1392f19079f8687d3f7979d827654ac8d