Merge "Update Soundpool callback interface" into tm-dev am: 9350158d4e am: 7e8128008e

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

Change-Id: Icef7da90955529fc682a968dd69745d66fb8d527