[automerger skipped] Merge "Update Bluetooth module for bluetooth.audio AIDL...

[automerger skipped] Merge "Update Bluetooth module for bluetooth.audio AIDL update" am: b11874a7 am: f1379dde -s ours

am skip reason: Merged-In Ieb910dfa6e4d6dbe12010a66638bc0d2e2f0d496 with SHA-1 d874792b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2429517



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