[automerger skipped] Merge Android 13 QPR1 am: 8bfc8b1f -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: Ibff2dbd111dfc63e542aa0bc3c0058c01307ce6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>