[automerger skipped] Merge "Make AudioManager.getReportedSurroundFormats a...

[automerger skipped] Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd8 am: 1d0ae7a1 -s ours

am skip reason: Merged-In If6287743f57b77d0eb2639e4a2e9409c7d778f06 with SHA-1 1380c0e8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14840460

Change-Id: Ibe5993550f0a12c2cf180f3d559fa50419a3afac