[automerger skipped] Merge "Merge Android 13 QPR1" am: 67a4fcc0 -s ours

am skip reason: Merged-In I61118f22577de7b975fb0df8dac8583e91f7b8c7 with SHA-1 37d4c6ff is already in history

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



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