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