[automerger skipped] Merge "Temporarily disable failing...

[automerger skipped] Merge "Temporarily disable failing HeadsetServiceAndStateMachineTest" into tm-qpr-dev am: 9760d9ab am: 482dc036 -s ours

am skip reason: Merged-In I8be0a5bcbb8c26e3ef178bcb25973783045b9f31 with SHA-1 46013104 is already in history

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



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