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

am skip reason: subject contains skip directive

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

Change-Id: I6194c8f80ea6c2e266052eac88a2ea67e39ed801