[automerger skipped] Merge "Make AudioManager.getSurroundFormats a TestApi"...

[automerger skipped] Merge "Make AudioManager.getSurroundFormats a TestApi" into sc-dev am: 79f5d3f4 am: 0caa4f6a -s ours

am skip reason: Merged-In I0122ff2a1f285aa01dc76e332a35798e19a07ac7 with SHA-1 3bec57aa is already in history

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

Change-Id: Ida5cf93bc911e926ce6daae4cc494fe48806df61