Merge changes from topic "move-surround-configuration-to-xml"

* changes:
  audio: Add configuration for surround sound
  audio: Copy audio_policy_configuration.xsd for HAL V4.1