Merge changes I14759daa,Idf6d76bc

* changes:
  Add test for setDeviceConnectionState.
  Refactor audiopolicymanager_tests.