[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 54cf6580 -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: Idd4d0f6add75eb78133a591ed56104ffc44c20de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>