[automerger skipped] Merge "Merge "Make...

[automerger skipped] Merge "Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd8 am: 4559e5b9" into sc-v2-dev-plus-aosp am: 3fe8ec2b -s ours

am skip reason: Merged-In If6287743f57b77d0eb2639e4a2e9409c7d778f06 with SHA-1 00e49c14 is already in history

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

Change-Id: Ic3c1dcb8e1d2e5a5863dbafe46024b20dfa1c7e2