Merge "Add channel index record to AudioPolicyManager"