Merge "Audio HAL: Add missing device to XSD" into android10-tests-dev