Merge "Soundpool: use audio attributes instead of legacy stream type" into...

Merge "Soundpool: use audio attributes instead of legacy stream type" into udc-dev am: b2a2f0d9 am: 48b3df22 am: 05f057e9 am: 8c2f2141

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



Change-Id: I371e82068d7cda89e0dd577b6829db88f21d6e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>