Merge "AudioPolicyManager: fix device enumeration" into nyc-dev