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

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

Change-Id: I9159a1f8f0caf0e96b47fa386f2393e458f7ec35