Merge "Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd8 am: 4559e5b9" into sc-v2-dev-plus-aosp