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 am: a9a34b36

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



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