Merge "Make AudioManager.getSurroundFormats a TestApi" into sc-dev