Merge "SoundPool: Fix channel mask reporting" am: 4b50dd4f am: 82c42ad3 am: 33ba555a

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



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