Merge "SoundPool: Fix channel mask reporting" into tm-qpr-dev am: 45eb2870

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



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