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

Change-Id: Ibd4368290502f620bc67d144253490442f9eaba2