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: 3c2c73c0 am: 73101a2d

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



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