[automerger skipped] DO NOT MERGE - Merge Android 13 am: c39e58c9 -s ours...

[automerger skipped] DO NOT MERGE - Merge Android 13 am: c39e58c9 -s ours am: c6364d8c -s ours am: ea3d434b -s ours am: a700cd6d -s ours

am skip reason: Merged-In I033bea0386fdec4f9f93f788b802823a703aeade with SHA-1 a566994c is already in history

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



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