Merge "Soundpool: use audio attributes instead of legacy stream type" into udc-dev am: b2a2f0d9

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



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