[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 54cf6580 -s...

[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 54cf6580 -s ours am: e0c42a43 -s ours am: 0bd22d1a -s ours am: b3b31f46 -s ours am: 0ae9a76f -s ours

am skip reason: subject contains skip directive

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



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