[automerger skipped] Merge "Merge Android 13 QPR2" am: b7d10fbd -s ours am:...

[automerger skipped] Merge "Merge Android 13 QPR2" am: b7d10fbd -s ours am: 3a419a53 -s ours am: 4d2cbe0a -s ours

am skip reason: Merged-In I9eb7903df1512b7fd745b3e56e5d0c07e261482d with SHA-1 4b9d7c12 is already in history

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



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