[automerger skipped] DO NOT MERGE Track SCO state in HfpClientDeviceBlock, and set SCO am: b0faa8e8 -s ours

am skip reason: skipped by user pirozzoj

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

Change-Id: Ib63b5106caa85dc8b9f0b200cc147d47c4a899ec