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

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



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