Merge changes I81bda912,I5ed93786 into udc-dev

* changes:
  Revert "AudioService: synchronize BT_SCO on and A2DP or LE suspended states"
  Revert "AudioDeviceBroker: fix deadlock with setA2dpSuspended"