Merge "AudioPolicyManager: only modify surround formats for HDMI devices" into nyc-dev