[automerger skipped] Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a am: b4630c8743 am: 832742e028 -s ours
am skip reason: Merged-In If6287743f57b77d0eb2639e4a2e9409c7d778f06 with SHA-1 00e49c1482 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14840460
Change-Id: I35c971192c4a27225ab98e14c9456adcf233ca9a
This commit is contained in: