[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: 88fea8f6 -s ours

am skip reason: Merged-In I55c45289591e7e6939874c4b9c09251fd1ebb966 with SHA-1 d596d7d1 is already in history

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



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