Merge "AudioPolicyManager: Ensure direct output matches exact format" into pi-dev
am: 8d57302e2d

Change-Id: I3005367e98e840800b72289565760488a47a9af2