Merge "Audio Policy: Use cached values for getSurroundFormats()"