Merge "BT: AptxAdaptive LE/LEX codec and AAC ABR AIDL Changes" am: a15a188883 am: f64171c3fa

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

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