Merge changes Id104edb5,Ie12b72b2

* changes:
  Add unit test for handle device config change
  Fix passing of ExtraAudioDescriptors to audio HAL